zudoku 0.0.0-e614aaa → 0.0.0-e6d1d34

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

@@ -90,7 +90,7 @@ export const ColorizedParam = ({
       {...{ [DATA_ATTR]: normalizedSlug }}
       className={cn(
         // This may not contain (inline-)flex or (inline-)block otherwise it breaks the browser's full text search
-        "relative rounded transition-all duration-100 rounded-lg",
+        "relative transition-all duration-100 rounded-lg",
         "border border-[--border-color] p-0.5 text-[--param-color] bg-[--background-color]",
         "data-[active=true]:border-[--param-color] data-[active=true]:shadow data-[active=true]:bottom-px",
         className,

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

@@ -1,13 +1,13 @@
 import { useSuspenseQuery } from "@tanstack/react-query";
 import { CheckIcon, CopyIcon } from "lucide-react";
 import { useState, useTransition } from "react";
-import { useSelectedServer } from "../../authentication/state.js";
 import { InlineCode } from "../../components/InlineCode.js";
 import { Button } from "../../ui/Button.js";
 import { useCreateQuery } from "./client/useCreateQuery.js";
 import { useOasConfig } from "./context.js";
 import { graphql } from "./graphql/index.js";
 import { SimpleSelect } from "./SimpleSelect.js";
+import { useSelectedServer } from "./state.js";
 
 const ServersQuery = graphql(/* GraphQL */ `
   query ServersQuery($input: JSON!, $type: SchemaType!) {

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

@@ -1,7 +1,13 @@
 import { type ResultOf } from "@graphql-typed-document-node/core";
-import { useSuspenseQuery } from "@tanstack/react-query";
+import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import { Helmet } from "@zudoku/react-helmet-async";
+import { ChevronsDownUpIcon, ChevronsUpDownIcon } from "lucide-react";
 import { useNavigate } from "react-router";
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "zudoku/ui/Collapsible.js";
 import {
   Select,
   SelectContent,
@@ -9,10 +15,10 @@ import {
   SelectTrigger,
   SelectValue,
 } from "zudoku/ui/Select.js";
-import { useSelectedServer } from "../../authentication/state.js";
 import { CategoryHeading } from "../../components/CategoryHeading.js";
 import { Heading } from "../../components/Heading.js";
 import { Markdown, ProseClasses } from "../../components/Markdown.js";
+import { Pagination } from "../../components/Pagination.js";
 import { useApiIdentities } from "../../components/context/ZudokuContext.js";
 import { cn } from "../../util/cn.js";
 import { Endpoint } from "./Endpoint.js";
@@ -20,6 +26,8 @@ import { OperationListItem } from "./OperationListItem.js";
 import { useCreateQuery } from "./client/useCreateQuery.js";
 import { useOasConfig } from "./context.js";
 import { graphql } from "./graphql/index.js";
+import { UNTAGGED_PATH } from "./index.js";
+import { useSelectedServer } from "./state.js";
 import { sanitizeMarkdownForMetatag } from "./util/sanitizeMarkdownForMetatag.js";
 
 export const OperationsFragment = graphql(/* GraphQL */ `
@@ -31,6 +39,8 @@ export const OperationsFragment = graphql(/* GraphQL */ `
     operationId
     contentTypes
     path
+    deprecated
+    extensions
     parameters {
       name
       in
@@ -38,6 +48,7 @@ export const OperationsFragment = graphql(/* GraphQL */ `
       required
       schema
       style
+      explode
       examples {
         name
         description
@@ -88,8 +99,16 @@ export const OperationsFragment = graphql(/* GraphQL */ `
 
 export type OperationListItemResult = ResultOf<typeof OperationsFragment>;
 
-const AllOperationsQuery = graphql(/* GraphQL */ `
-  query AllOperations(
+const SchemaWarmupQuery = graphql(/* GraphQL */ `
+  query SchemaWarmup($input: JSON!, $type: SchemaType!) {
+    schema(input: $input, type: $type) {
+      openapi
+    }
+  }
+`);
+
+const OperationsForTagQuery = graphql(/* GraphQL */ `
+  query OperationsForTag(
     $input: JSON!
     $type: SchemaType!
     $tag: String
@@ -104,13 +123,21 @@ const AllOperationsQuery = graphql(/* GraphQL */ `
       title
       url
       version
-      tags(name: $tag) {
+      tag(slug: $tag, untagged: $untagged) {
         name
         description
-      }
-      operations(tag: $tag, untagged: $untagged) {
-        slug
-        ...OperationsFragment
+        operations {
+          slug
+          ...OperationsFragment
+        }
+        next {
+          name
+          slug
+        }
+        prev {
+          name
+          slug
+        }
       }
     }
   }
@@ -123,8 +150,8 @@ export const OperationList = ({
   tag?: string;
   untagged?: boolean;
 }) => {
-  const { input, type, versions, version } = useOasConfig();
-  const query = useCreateQuery(AllOperationsQuery, {
+  const { input, type, versions, version, options } = useOasConfig();
+  const query = useCreateQuery(OperationsForTagQuery, {
     input,
     type,
     tag,
@@ -139,20 +166,48 @@ export const OperationList = ({
   const summary = schema.summary;
   const description = schema.description;
   const navigate = useNavigate();
-  const operations = schema.operations;
+
+  // This is to warmup (i.e. load the schema in the background) the schema on the client, if the page has been rendered on the server
+  const warmupQuery = useCreateQuery(SchemaWarmupQuery, { input, type });
+  useQuery({
+    ...warmupQuery,
+    enabled: typeof window !== "undefined",
+    notifyOnChangeProps: [],
+  });
+
   // Prefetch for Playground
   useApiIdentities();
 
+  if (!schema.tag) return null;
+
+  const { operations, next, prev, description: tagDescription } = schema.tag;
+
   // The summary property is preferable here as it is a short description of
   // the API, whereas the description property is typically longer and supports
   // commonmark formatting, making it ill-suited for use in the meta description
-  const metaDescription = summary
-    ? summary
-    : description
-      ? sanitizeMarkdownForMetatag(description)
-      : undefined;
+  const metaDescription = tagDescription
+    ? sanitizeMarkdownForMetatag(tagDescription)
+    : summary
+      ? summary
+      : description
+        ? sanitizeMarkdownForMetatag(description)
+        : undefined;
 
-  const showVersions = Object.entries(versions).length > 1;
+  const hasMultipleVersions = Object.entries(versions).length > 1;
+
+  const showVersions =
+    options?.showVersionSelect === "always" ||
+    (hasMultipleVersions && options?.showVersionSelect !== "hide");
+
+  const paginationProps = {
+    prev: prev?.name ? { to: `../${prev.slug}`, label: prev.name } : undefined,
+    next: next
+      ? {
+          to: `../${next.slug ?? UNTAGGED_PATH}`,
+          label: next.name ?? "Other endpoints",
+        }
+      : undefined,
+  };
 
   return (
     <div
@@ -161,85 +216,108 @@ export const OperationList = ({
       data-pagefind-meta="section:openapi"
     >
       <Helmet>
-        <title>{title}</title>
+        <title>{[schema.tag.name, title].filter(Boolean).join(" - ")}</title>
         {metaDescription && (
           <meta name="description" content={metaDescription} />
         )}
       </Helmet>
-      <div
-        className={cn(ProseClasses, "mb-16 max-w-full prose-img:max-w-prose")}
-      >
-        <div className="flex">
-          <div className="flex-1">
-            <CategoryHeading>Overview</CategoryHeading>
-            <Heading level={1} id="description" registerSidebarAnchor>
-              {title}
+      <div className="mb-8">
+        <Collapsible className="w-full">
+          <div className="flex flex-col gap-y-4 sm:flex-row justify-around items-start sm:items-end">
+            <div className="flex flex-col flex-1 gap-2">
+              <CategoryHeading>{title}</CategoryHeading>
+              <Heading
+                level={1}
+                id="description"
+                registerSidebarAnchor
+                className="mb-0"
+              >
+                {schema.tag.name ?? "Other endpoints"}
+                {showVersions && (
+                  <span className="text-xl text-muted-foreground ml-1.5">
+                    {" "}
+                    ({version})
+                  </span>
+                )}
+              </Heading>
+              <Endpoint />
+            </div>
+            <div className="flex flex-col gap-4 sm:items-end">
               {showVersions && (
-                <span className="text-xl text-muted-foreground">
-                  {" "}
-                  ({version})
-                </span>
+                <Select
+                  onValueChange={(version) => navigate(versions[version]!)}
+                  defaultValue={version}
+                  disabled={!hasMultipleVersions}
+                >
+                  <SelectTrigger className="w-[180px]">
+                    <SelectValue placeholder="Select version" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {Object.entries(versions).map(([version]) => (
+                      <SelectItem key={version} value={version}>
+                        {version}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              )}
+              {schema.description && (
+                <CollapsibleTrigger className="flex items-center gap-1 text-sm font-medium text-muted-foreground group">
+                  <span>API information</span>
+
+                  <ChevronsUpDownIcon
+                    className="group-data-[state=open]:hidden translate-y-px"
+                    size={14}
+                  />
+                  <ChevronsDownUpIcon
+                    className="group-data-[state=closed]:hidden translate-y-px"
+                    size={13}
+                  />
+                </CollapsibleTrigger>
               )}
-            </Heading>
+            </div>
           </div>
-          <div>
-            {showVersions && (
-              <Select
-                onValueChange={(version) => navigate(versions[version]!)}
-                defaultValue={version}
+          {schema.description && (
+            <CollapsibleContent className="CollapsibleContent">
+              <div
+                className={cn(
+                  ProseClasses,
+                  "pt-4 max-w-full prose-img:max-w-prose",
+                )}
               >
-                <SelectTrigger className="w-[180px]">
-                  <SelectValue placeholder="Select version" />
-                </SelectTrigger>
-                <SelectContent>
-                  {Object.entries(versions).map(([version]) => (
-                    <SelectItem key={version} value={version}>
-                      {version}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
+                <Markdown
+                  className="border rounded bg-muted/25 border-border px-2.5 md:px-4"
+                  content={schema.description}
+                />
+              </div>
+            </CollapsibleContent>
+          )}
+        </Collapsible>
+        {tagDescription && (
+          <div
+            className={cn(
+              ProseClasses,
+              "my-4 max-w-full prose-img:max-w-prose",
             )}
+          >
+            <Markdown content={tagDescription} />
           </div>
-        </div>
-        <Markdown content={schema.description ?? ""} />
+        )}
       </div>
       <hr />
-      <div className="my-4 flex items-center justify-end gap-4">
-        <Endpoint />
-      </div>
-      {operations.map((fragment) => (
-        <OperationListItem
-          serverUrl={selectedServer}
-          key={fragment.slug}
-          operationFragment={fragment}
-        />
-      ))}
-      {/* {schema.tags
-        .filter((tag) => tag.operations.length > 0)
-        .map((tag) => (
-          // px, -mx is so that `content-visibility` doesn't cut off overflown heading anchor links '#'
-          <div key={tag.name} className="px-6 -mx-6 [content-visibility:auto]">
-            {tag.name && <CategoryHeading>{tag.name}</CategoryHeading>}
-            {tag.description && (
-              <Markdown
-                className={`${ProseClasses} max-w-full prose-img:max-w-prose w-full mt-2 mb-12`}
-                content={tag.description}
-              />
-            )}
-            <div className="operation mb-12">
-              <StaggeredRender>
-                {tag.operations.map((fragment) => (
-                  <OperationListItem
-                    serverUrl={selectedServer ?? schema.url}
-                    key={fragment.slug}
-                    operationFragment={fragment}
-                  />
-                ))}
-              </StaggeredRender>
-            </div>
+      {/* px, -mx is so that `content-visibility` doesn't cut off overflown heading anchor links '#' */}
+      <div className="px-6 mt-6 -mx-6 [content-visibility:auto]">
+        {operations.map((fragment) => (
+          <div key={fragment.slug}>
+            <OperationListItem
+              serverUrl={selectedServer}
+              operationFragment={fragment}
+            />
+            <hr className="my-10" />
           </div>
-        ))} */}
+        ))}
+        <Pagination className="mb-4" {...paginationProps} />
+      </div>
     </div>
   );
 };

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

@@ -1,14 +1,17 @@
 import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
-import { useRef, useState } from "react";
+import { useState } from "react";
+import { Badge } from "zudoku/ui/Badge.js";
 import { Heading } from "../../components/Heading.js";
 import { Markdown, ProseClasses } from "../../components/Markdown.js";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../ui/Tabs.js";
+import { cn } from "../../util/cn.js";
 import { groupBy } from "../../util/groupBy.js";
 import { renderIf } from "../../util/renderIf.js";
 import { OperationsFragment } from "./OperationList.js";
 import { ParameterList } from "./ParameterList.js";
 import { Sidecar } from "./Sidecar.js";
-import { FragmentType, useFragment } from "./graphql/index.js";
+import { SelectOnClick } from "./components/SelectOnClick.js";
+import { type FragmentType, useFragment } from "./graphql/index.js";
 import { SchemaView } from "./schema/SchemaView.js";
 import { methodForColor } from "./util/methodToColor.js";
 
@@ -27,144 +30,147 @@ export const OperationListItem = ({
     operation.parameters ?? [],
     (param) => param.in,
   );
-  const parentRef = useRef<HTMLDivElement>(null);
 
   const first = operation.responses.at(0);
   const [selectedResponse, setSelectedResponse] = useState(first?.statusCode);
 
   return (
-    <div
-      key={operation.operationId}
-      className="grid grid-cols-1 lg:grid-cols-[minmax(0,4fr)_minmax(0,3fr)] gap-8 items-start border-b-2 mb-16 pb-16"
-    >
-      <div className="flex flex-col gap-4">
+    <div>
+      {operation.deprecated && (
+        <Badge variant="muted" className="text-xs mb-4">
+          deprecated
+        </Badge>
+      )}
+      <div
+        key={operation.operationId}
+        className={cn(
+          "grid grid-cols-1 lg:grid-cols-[minmax(0,4fr)_minmax(0,3fr)] gap-x-8 gap-y-4 items-start",
+          operation.deprecated && "opacity-50 transition hover:opacity-100",
+        )}
+      >
         <Heading
           level={2}
           id={operation.slug}
           registerSidebarAnchor
-          className="break-all"
+          className="break-all col-span-full"
         >
           {operation.summary}
         </Heading>
-        <div className="text-sm flex gap-2 font-mono">
+        <div className="text-sm flex gap-2 font-mono col-span-full">
           <span className={methodForColor(operation.method)}>
             {operation.method.toUpperCase()}
           </span>
-          <div
-            ref={parentRef}
-            className="max-w-full truncate flex cursor-pointer"
-            onClick={() => {
-              if (parentRef.current) {
-                const range = document.createRange();
-                range.selectNodeContents(parentRef.current);
-                const selection = window.getSelection();
-                selection?.removeAllRanges();
-                selection?.addRange(range);
-              }
-            }}
-          >
+          <SelectOnClick className="max-w-full truncate flex cursor-pointer">
             {serverUrl && (
               <div className="text-neutral-400 dark:text-neutral-500 truncate">
-                {serverUrl}
+                {serverUrl.replace(/\/$/, "")}
               </div>
             )}
             <div className="text-neutral-900 dark:text-neutral-200">
               {operation.path}
             </div>
-          </div>
+          </SelectOnClick>
         </div>
-        {operation.description && (
-          <Markdown
-            className={`${ProseClasses} max-w-full prose-img:max-w-prose`}
-            content={operation.description}
-          />
-        )}
-        {operation.parameters && operation.parameters.length > 0 && (
-          <>
-            {PARAM_GROUPS.flatMap((group) =>
-              groupedParameters[group]?.length ? (
-                <ParameterList
-                  key={group}
-                  summary={operation.summary ?? undefined}
-                  id={operation.slug}
-                  parameters={groupedParameters[group]}
-                  group={group}
-                />
-              ) : (
-                []
-              ),
-            )}
-          </>
-        )}
-        {renderIf(operation.requestBody?.content?.at(0)?.schema, (schema) => (
-          <div className="mt-4 flex flex-col gap-4">
-            <Heading
-              level={3}
-              className="capitalize"
-              id={`${operation.slug}/request-body`}
-            >
-              {operation.summary && (
-                <VisuallyHidden>{operation.summary} &rsaquo; </VisuallyHidden>
-              )}
-              Request Body
-            </Heading>
-            <SchemaView schema={schema} />
-          </div>
-        ))}
-        {operation.responses.length > 0 && (
-          <>
-            <Heading
-              level={3}
-              className="capitalize mt-8 pt-8 border-t"
-              id={`${operation.slug}/responses`}
-            >
-              {operation.summary && (
-                <VisuallyHidden>{operation.summary} &rsaquo; </VisuallyHidden>
+
+        <div className="flex flex-col gap-4">
+          {operation.description && (
+            <Markdown
+              className={`${ProseClasses} max-w-full prose-img:max-w-prose`}
+              content={operation.description}
+            />
+          )}
+          {operation.parameters && operation.parameters.length > 0 && (
+            <>
+              {PARAM_GROUPS.flatMap((group) =>
+                groupedParameters[group]?.length ? (
+                  <ParameterList
+                    key={group}
+                    summary={operation.summary ?? undefined}
+                    id={operation.slug}
+                    parameters={groupedParameters[group]}
+                    group={group}
+                  />
+                ) : (
+                  []
+                ),
               )}
-              Responses
-            </Heading>
-            <Tabs
-              onValueChange={(value) => setSelectedResponse(value)}
-              value={selectedResponse}
-            >
-              {operation.responses.length > 1 && (
-                <TabsList>
+            </>
+          )}
+          {renderIf(operation.requestBody?.content?.at(0)?.schema, (schema) => (
+            <div className="mt-4 flex flex-col gap-4">
+              <Heading
+                level={3}
+                className="capitalize flex items-center gap-2"
+                id={`${operation.slug}/request-body`}
+              >
+                {operation.summary && (
+                  <VisuallyHidden>{operation.summary} &rsaquo; </VisuallyHidden>
+                )}
+                Request Body{" "}
+                {operation.requestBody?.required === false ? (
+                  <Badge variant="muted">optional</Badge>
+                ) : (
+                  ""
+                )}
+              </Heading>
+              <SchemaView schema={schema} />
+            </div>
+          ))}
+          {operation.responses.length > 0 && (
+            <>
+              <Heading
+                level={3}
+                className="capitalize mt-8 pt-8 border-t"
+                id={`${operation.slug}/responses`}
+              >
+                {operation.summary && (
+                  <VisuallyHidden>{operation.summary} &rsaquo; </VisuallyHidden>
+                )}
+                Responses
+              </Heading>
+              <Tabs
+                onValueChange={(value) => setSelectedResponse(value)}
+                value={selectedResponse}
+              >
+                {operation.responses.length > 1 && (
+                  <TabsList>
+                    {operation.responses.map((response) => (
+                      <TabsTrigger
+                        value={response.statusCode}
+                        key={response.statusCode}
+                        title={response.description ?? undefined}
+                      >
+                        {response.statusCode}
+                      </TabsTrigger>
+                    ))}
+                  </TabsList>
+                )}
+                <ul className="list-none m-0 px-0">
                   {operation.responses.map((response) => (
-                    <TabsTrigger
+                    <TabsContent
                       value={response.statusCode}
                       key={response.statusCode}
-                      title={response.description ?? undefined}
                     >
-                      {response.statusCode}
-                    </TabsTrigger>
+                      <SchemaView
+                        schema={
+                          response.content?.find((content) => content.schema)
+                            ?.schema
+                        }
+                      />
+                    </TabsContent>
                   ))}
-                </TabsList>
-              )}
-              <ul className="list-none m-0 px-0">
-                {operation.responses.map((response) => (
-                  <TabsContent
-                    value={response.statusCode}
-                    key={response.statusCode}
-                  >
-                    <SchemaView
-                      schema={
-                        response.content?.find((content) => content.schema)
-                          ?.schema
-                      }
-                    />
-                  </TabsContent>
-                ))}
-              </ul>
-            </Tabs>
-          </>
-        )}
-      </div>
+                </ul>
+              </Tabs>
+            </>
+          )}
+        </div>
 
-      <Sidecar
-        selectedResponse={selectedResponse}
-        onSelectResponse={setSelectedResponse}
-        operation={operation}
-      />
+        <Sidecar
+          selectedResponse={selectedResponse}
+          onSelectResponse={setSelectedResponse}
+          operation={operation}
+        />
+      </div>
     </div>
   );
 };