zudoku 0.0.0-f471fb8 → 0.0.0-f52e8af

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

@@ -3,14 +3,15 @@ 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 { ResponseContent } from "./components/ResponseContent.js";
 import { SelectOnClick } from "./components/SelectOnClick.js";
+import { useOasConfig } from "./context.js";
 import { type FragmentType, useFragment } from "./graphql/index.js";
 import { SchemaView } from "./schema/SchemaView.js";
 import { methodForColor } from "./util/methodToColor.js";
@@ -30,12 +31,13 @@ export const OperationListItem = ({
     operation.parameters ?? [],
     (param) => param.in,
   );
+  const { options } = useOasConfig();
 
   const first = operation.responses.at(0);
   const [selectedResponse, setSelectedResponse] = useState(first?.statusCode);
 
   return (
-    <div className="border-b-2 mb-16 pb-16">
+    <div>
       {operation.deprecated && (
         <Badge variant="muted" className="text-xs mb-4">
           deprecated
@@ -52,7 +54,7 @@ export const OperationListItem = ({
           level={2}
           id={operation.slug}
           registerSidebarAnchor
-          className="break-all"
+          className="break-all col-span-full"
         >
           {operation.summary}
         </Heading>
@@ -72,7 +74,12 @@ export const OperationListItem = ({
           </SelectOnClick>
         </div>
 
-        <div className="flex flex-col gap-4">
+        <div
+          className={cn(
+            "flex flex-col gap-4",
+            options?.disableSidecar && "col-span-full",
+          )}
+        >
           {operation.description && (
             <Markdown
               className={`${ProseClasses} max-w-full prose-img:max-w-prose`}
@@ -128,48 +135,22 @@ export const OperationListItem = ({
                 )}
                 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) => (
-                    <TabsContent
-                      value={response.statusCode}
-                      key={response.statusCode}
-                    >
-                      <SchemaView
-                        schema={
-                          response.content?.find((content) => content.schema)
-                            ?.schema
-                        }
-                      />
-                    </TabsContent>
-                  ))}
-                </ul>
-              </Tabs>
+              <ResponseContent
+                responses={operation.responses}
+                selectedResponse={selectedResponse}
+                onSelectResponse={setSelectedResponse}
+              />
             </>
           )}
         </div>
 
-        <Sidecar
-          selectedResponse={selectedResponse}
-          onSelectResponse={setSelectedResponse}
-          operation={operation}
-        />
+        {renderIf(!options?.disableSidecar, () => (
+          <Sidecar
+            selectedResponse={selectedResponse}
+            onSelectResponse={setSelectedResponse}
+            operation={operation}
+          />
+        ))}
       </div>
     </div>
   );

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

@@ -30,12 +30,15 @@ const getSchemaInfos = (schema?: SchemaObject) => {
 
   return [
     schema.type === "array" && schema.items.type
-      ? `${schema.items.type}[]`
+      ? Array.isArray(schema.items.type)
+        ? `(${schema.items.type.join(" | ")})[]`
+        : `${schema.items.type}[]`
       : Array.isArray(schema.type)
         ? schema.type.join(" | ")
         : schema.type,
 
     schema.enum && "enum",
+    schema.const && "const",
     schema.format,
     schema.minimum && `min: ${schema.minimum}`,
     schema.maximum && `max: ${schema.maximum}`,

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

@@ -1,11 +1,18 @@
+import * as Collapsible from "@radix-ui/react-collapsible";
+import { MinusIcon, PlusIcon } from "lucide-react";
+import { useState } from "react";
 import { Markdown } from "../../components/Markdown.js";
 import { type SchemaObject } from "../../oas/graphql/index.js";
+import { Button } from "../../ui/Button.js";
 import { ColorizedParam } from "./ColorizedParam.js";
 import type { OperationListItemResult } from "./OperationList.js";
 import type { ParameterGroup } from "./OperationListItem.js";
 import { ParamInfos } from "./ParamInfos.js";
 import { EnumValues } from "./components/EnumValues.js";
 import { SelectOnClick } from "./components/SelectOnClick.js";
+import { SchemaExampleAndDefault } from "./schema/SchemaExampleAndDefault.js";
+import { SchemaView } from "./schema/SchemaView.js";
+import { isArrayType } from "./schema/utils.js";
 
 const getParameterSchema = (
   parameter: ParameterListItemResult,
@@ -32,6 +39,7 @@ export const ParameterListItem = ({
   id: string;
 }) => {
   const paramSchema = getParameterSchema(parameter);
+  const [isOpen, setIsOpen] = useState(false);
 
   return (
     <li className="p-4 bg-border/20 text-sm flex flex-col gap-1.5">
@@ -72,6 +80,30 @@ export const ParameterListItem = ({
       ) : (
         paramSchema.enum && <EnumValues values={paramSchema.enum} />
       )}
+      <SchemaExampleAndDefault schema={paramSchema} />
+      {(paramSchema.type === "object" || isArrayType(paramSchema)) && (
+        <Collapsible.Root
+          defaultOpen={false}
+          onOpenChange={setIsOpen}
+          open={isOpen}
+        >
+          <Collapsible.Trigger asChild>
+            <Button variant="expand" size="sm">
+              {isOpen ? <MinusIcon size={12} /> : <PlusIcon size={12} />}
+              {isOpen ? "Hide properties" : "Show properties"}
+            </Button>
+          </Collapsible.Trigger>
+          <Collapsible.Content>
+            <div className="mt-2">
+              <SchemaView
+                schema={
+                  "items" in paramSchema ? paramSchema.items : paramSchema
+                }
+              />
+            </div>
+          </Collapsible.Content>
+        </Collapsible.Root>
+      )}
     </li>
   );
 };

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

@@ -1,28 +1,15 @@
 import * as Tabs from "@radix-ui/react-tabs";
 import { cn } from "../../util/cn.js";
-import type { OperationListItemResult } from "./OperationList.js";
 import * as SidecarBox from "./SidecarBox.js";
 import { SidecarExamples } from "./SidecarExamples.js";
-
-type Responses = OperationListItemResult["responses"];
-
-const ResponseContent = ({ response }: { response: Responses[number] }) => {
-  return (
-    <Tabs.Content value={response.statusCode}>
-      <SidecarExamples
-        content={response.content ?? []}
-        description={response.description ?? undefined}
-      />
-    </Tabs.Content>
-  );
-};
+import type { ResponseItem } from "./graphql/graphql.js";
 
 export const ResponsesSidecarBox = ({
   responses,
   selectedResponse,
   onSelectResponse,
 }: {
-  responses: Responses;
+  responses: ResponseItem[];
   selectedResponse?: string;
   onSelectResponse: (response: string) => void;
 }) => {
@@ -52,7 +39,9 @@ export const ResponsesSidecarBox = ({
           </Tabs.List>
         </SidecarBox.Head>
         {responses.map((response) => (
-          <ResponseContent key={response.statusCode} response={response} />
+          <Tabs.Content key={response.statusCode} value={response.statusCode}>
+            <SidecarExamples content={response.content ?? []} />
+          </Tabs.Content>
         ))}
       </Tabs.Root>
     </SidecarBox.Root>

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

@@ -1,5 +1,6 @@
 import slugify from "@sindresorhus/slugify";
 import { useSuspenseQuery } from "@tanstack/react-query";
+import { Helmet } from "@zudoku/react-helmet-async";
 import {
   ChevronRightIcon,
   ChevronsDownUpIcon,
@@ -47,22 +48,33 @@ export function SchemaList() {
   const { data } = useSuspenseQuery(schemasQuery);
 
   const schemas = data.schema.components?.schemas ?? [];
-
-  if (!schemas.length) {
-    return <div>No schemas found</div>;
-  }
-
   const hasMultipleVersions = Object.entries(versions).length > 1;
   const showVersions =
     options?.showVersionSelect === "always" ||
     (hasMultipleVersions && options?.showVersionSelect !== "hide");
 
+  if (!schemas.length) {
+    return (
+      <div>
+        <Helmet>
+          <title>Schemas {showVersions ? version : ""}</title>
+          <meta name="description" content="List of schemas used by the API." />
+        </Helmet>
+        No schemas found
+      </div>
+    );
+  }
+
   return (
     <div
       className="grid grid-cols-[--sidecar-grid-cols] gap-8 justify-between"
       data-pagefind-filter="section:openapi"
       data-pagefind-meta="section:openapi"
     >
+      <Helmet>
+        <title>Schemas {showVersions ? version : ""}</title>
+        <meta name="description" content="List of schemas used by the API." />
+      </Helmet>
       <div className="pt-[--padding-content-top] pb-[--padding-content-bottom]">
         <Collapsible className="w-full">
           <div className="flex flex-col gap-y-4 sm:flex-row justify-around items-start sm:items-end">
@@ -76,7 +88,7 @@ export function SchemaList() {
               >
                 Schemas
                 {showVersions && (
-                  <span className="text-xl text-muted-foreground ml-1.5">
+                  <span className="text-xl text-muted-foreground ms-1.5">
                     ({version})
                   </span>
                 )}
@@ -84,7 +96,7 @@ export function SchemaList() {
             </div>
             {data.schema.description && (
               <CollapsibleTrigger className="flex items-center gap-1 text-sm font-medium text-muted-foreground group">
-                <span>Schema description</span>
+                <span>API information</span>
                 <ChevronsUpDownIcon
                   className="group-data-[state=open]:hidden translate-y-px"
                   size={14}

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

@@ -168,8 +168,40 @@ export const Sidecar = ({
             mimeType: "application/json",
           }
         : ({} as any),
-      headers: [{ name: "Content-Type", value: "application/json" }],
-      queryString: [],
+      headers: [
+        { name: "Content-Type", value: "application/json" },
+        ...(operation.parameters
+          ?.filter((p) => p.in === "header" && p.required === true)
+          .map((p) => ({
+            name: p.name,
+            value:
+              p.examples?.find((x) => x.value)?.value ??
+              p.schema?.default ??
+              (p.schema?.type === "string"
+                ? "string"
+                : p.schema?.type === "number" || p.schema?.type === "integer"
+                  ? "0"
+                  : p.schema?.type === "boolean"
+                    ? "true"
+                    : ""),
+          })) ?? []),
+      ],
+      queryString:
+        operation.parameters
+          ?.filter((p) => p.in === "query" && p.required === true)
+          .map((p) => ({
+            name: p.name,
+            value:
+              p.examples?.find((x) => x.value)?.value ??
+              p.schema?.default ??
+              (p.schema?.type === "string"
+                ? "string"
+                : p.schema?.type === "number" || p.schema?.type === "integer"
+                  ? "0"
+                  : p.schema?.type === "boolean"
+                    ? "true"
+                    : ""),
+          })) ?? [],
       httpVersion: "",
       cookies: [],
       headersSize: 0,
@@ -184,6 +216,7 @@ export const Sidecar = ({
     operation.path,
     selectedServer,
     selectedLang,
+    operation.parameters,
   ]);
   const [ref, isOnScreen] = useOnScreen({ rootMargin: "200px 0px 200px 0px" });
 
@@ -225,7 +258,7 @@ export const Sidecar = ({
                 <SyntaxHighlight
                   language={selectedLang}
                   noBackground
-                  className="[--scrollbar-color:gray] text-xs max-h-[500px] p-2"
+                  className="[--scrollbar-color:gray] rounded-none text-xs max-h-[500px] p-2"
                   code={code!}
                 />
               </CollapsibleCode>

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

@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from "react";
-import { SchemaObject } from "../../oas/parser/index.js";
+import { type SchemaObject } from "../../oas/parser/index.js";
 import { SyntaxHighlight } from "../../ui/SyntaxHighlight.js";
 import { CollapsibleCode } from "./CollapsibleCode.js";
 import type { OperationListItemResult } from "./OperationList.js";
@@ -22,7 +22,13 @@ const formatForDisplay = (value: unknown): string => {
 
 const getLanguage = (mediaType?: string): string => {
   if (!mediaType) return "plain";
+  if (mediaType.endsWith("+json")) return "json";
+  if (mediaType.endsWith("+xml")) return "xml";
+  if (mediaType.endsWith("+yaml")) return "yaml";
+
   const languages: Record<string, string> = {
+    "text/html": "html",
+    "application/x-ndjson": "json",
     "application/json": "json",
     "application/xml": "xml",
     "application/x-yaml": "yaml",
@@ -97,7 +103,7 @@ export const SidecarExamples = ({
             <SyntaxHighlight
               language={language}
               noBackground
-              className="[--scrollbar-color:gray] text-xs max-h-[500px] p-2"
+              className="[--scrollbar-color:gray] rounded-none text-xs max-h-[500px] p-2"
               code={formattedExample}
             />
           </CollapsibleCode>

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

@@ -1,12 +1,29 @@
 import { stripIgnoredCharacters } from "graphql";
 import { use } from "react";
 import type { TypedDocumentString } from "../graphql/graphql.js";
+import type { GraphQLClient } from "./GraphQLClient.js";
 import { GraphQLContext } from "./GraphQLContext.js";
 
 type NoExtraProps<T, U extends T = T> = U & {
   [K in Exclude<keyof U, keyof T>]?: never;
 };
 
+type VarArgs<TVariables> =
+  TVariables extends Record<string, never> ? [] : [NoExtraProps<TVariables>];
+
+export const createQuery = <TResult, TVariables>(
+  client: GraphQLClient,
+  query: TypedDocumentString<TResult, TVariables>,
+  ...[variables]: TVariables extends Record<string, never>
+    ? []
+    : [NoExtraProps<TVariables>]
+) => {
+  return {
+    queryFn: () => client.fetch(query, variables),
+    queryKey: [stripIgnoredCharacters(query.toString()), variables],
+  } as const;
+};
+
 export const useCreateQuery = <TResult, TVariables>(
   query: TypedDocumentString<TResult, TVariables>,
   ...[variables]: TVariables extends Record<string, never>
@@ -19,8 +36,10 @@ export const useCreateQuery = <TResult, TVariables>(
     throw new Error("useGraphQL must be used within a GraphQLProvider");
   }
 
-  return {
-    queryFn: () => graphQLClient.fetch(query, variables),
-    queryKey: [stripIgnoredCharacters(query.toString()), variables],
-  } as const;
+  const args =
+    variables === undefined
+      ? ([] as VarArgs<TVariables>)
+      : ([variables] as VarArgs<TVariables>);
+
+  return createQuery(graphQLClient, query, ...args);
 };

package/src/lib/plugins/openapi/components/ConstValue.tsx

@@ -0,0 +1,24 @@
+import type { SchemaObject } from "../../../oas/parser/index.js";
+import { SelectOnClick } from "./SelectOnClick.js";
+
+export const ConstValue = ({
+  schema,
+  hideDescription = false,
+}: {
+  schema: SchemaObject;
+  hideDescription?: boolean;
+}) => {
+  return (
+    <div className="flex flex-col gap-1 text-xs">
+      <div>
+        <span className="text-muted-foreground">Const value: </span>
+        <SelectOnClick className="border rounded px-1 font-mono">
+          {schema.const}
+        </SelectOnClick>
+        {!hideDescription && schema.description && (
+          <div className="text-muted-foreground">{schema.description}</div>
+        )}
+      </div>
+    </div>
+  );
+};

package/src/lib/plugins/openapi/components/EnumValues.tsx

@@ -26,7 +26,7 @@ export const EnumValues = ({
       <span className="text-muted-foreground">Enum values: </span>
       {visibleValues.map((value) => (
         <div key={value}>
-          <SelectOnClick className="border rounded px-1 font-mono cursor-pointer">
+          <SelectOnClick className="border rounded px-1 font-mono">
             {value}
           </SelectOnClick>
         </div>

package/src/lib/plugins/openapi/components/ResponseContent.tsx

@@ -0,0 +1,104 @@
+import * as Tabs from "@radix-ui/react-tabs";
+import { useState } from "react";
+import { Markdown } from "zudoku/components";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "zudoku/ui/Select.js";
+import { cn } from "zudoku/ui/util.js";
+import type { MediaTypeObject } from "../graphql/graphql.js";
+import { SchemaView } from "../schema/SchemaView.js";
+
+type Response = {
+  statusCode: string;
+  description?: string | null;
+  content?: MediaTypeObject[] | null;
+};
+
+export const ResponseContent = ({
+  responses,
+  selectedResponse,
+  onSelectResponse,
+}: {
+  responses: Response[];
+  selectedResponse?: string;
+  onSelectResponse?: (value: string) => void;
+}) => {
+  const [selectedMediaType, setSelectedMediaType] = useState(
+    responses[0]?.content?.[0]?.mediaType ?? "",
+  );
+  const currentResponse =
+    responses.find((r) => r.statusCode === selectedResponse) ?? responses[0];
+
+  const cardHeader = (
+    <div className="flex flex-col bg-muted text-muted-foreground">
+      <div className="flex flex-row items-center gap-2 justify-between px-4 py-2">
+        <Tabs.List className="flex flex-row font-medium text-sm gap-4">
+          {responses.map((response) => (
+            <Tabs.Trigger
+              key={response.statusCode}
+              value={response.statusCode}
+              className={cn(
+                "py-1 -mx-2 px-2 rounded-md",
+                "data-[state=active]:dark:ring-1 data-[state=active]:dark:ring-border data-[state=active]:bg-background data-[state=active]:drop-shadow",
+                "data-[state=active]:font-semibold data-[state=active]:text-foreground",
+              )}
+            >
+              {response.statusCode}
+            </Tabs.Trigger>
+          ))}
+        </Tabs.List>
+        {currentResponse?.content && currentResponse.content.length > 1 && (
+          <Select
+            value={selectedMediaType}
+            onValueChange={setSelectedMediaType}
+          >
+            <SelectTrigger className="h-8 mt-0 max-w-48 text-xs truncate">
+              <SelectValue placeholder="Select a type" />
+            </SelectTrigger>
+            <SelectContent>
+              {currentResponse.content.map((c) => (
+                <SelectItem key={c.mediaType} value={c.mediaType}>
+                  {c.mediaType}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        )}
+      </div>
+      {currentResponse?.description && (
+        <Markdown
+          className="text-sm border-t px-4 py-2 text-muted-foreground"
+          content={currentResponse.description}
+        />
+      )}
+    </div>
+  );
+
+  return (
+    <div className="flex flex-col gap-2">
+      <Tabs.Root
+        value={selectedResponse}
+        onValueChange={(value) => {
+          onSelectResponse?.(value);
+          const newResponse = responses.find((r) => r.statusCode === value);
+          setSelectedMediaType(newResponse?.content?.[0]?.mediaType ?? "");
+        }}
+      >
+        {responses.map((response) => {
+          const content = response.content?.find(
+            (c) => c.mediaType === selectedMediaType,
+          );
+          return (
+            <Tabs.Content key={response.statusCode} value={response.statusCode}>
+              <SchemaView schema={content?.schema} cardHeader={cardHeader} />
+            </Tabs.Content>
+          );
+        })}
+      </Tabs.Root>
+    </div>
+  );
+};

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

@@ -6,7 +6,8 @@ import { type ZudokuPlugin } from "../../core/plugins.js";
 import { Button } from "../../ui/Button.js";
 import { joinUrl } from "../../util/joinUrl.js";
 import { GraphQLClient } from "./client/GraphQLClient.js";
-import type { GetSidebarOperationsQuery } from "./graphql/graphql.js";
+import { createQuery } from "./client/useCreateQuery.js";
+import type { GetSidebarOperationsQuery as GetSidebarOperationsQueryResult } from "./graphql/graphql.js";
 import { graphql } from "./graphql/index.js";
 import { type OasPluginConfig } from "./interfaces.js";
 import type { PlaygroundContentProps } from "./playground/Playground.js";
@@ -14,7 +15,7 @@ import { PlaygroundDialog } from "./playground/PlaygroundDialog.js";
 import { createSidebarCategory } from "./util/createSidebarCategory.js";
 import { getRoutes, getVersions } from "./util/getRoutes.js";
 
-const GetSidebarOperationsQuery = graphql(`
+export const GetSidebarOperationsQuery = graphql(`
   query GetSidebarOperations($input: JSON!, $type: SchemaType!) {
     schema(input: $input, type: $type) {
       tags {
@@ -39,7 +40,7 @@ const GetSidebarOperationsQuery = graphql(`
 `);
 
 export type OperationResult =
-  GetSidebarOperationsQuery["schema"]["tags"][number]["operations"][number];
+  GetSidebarOperationsQueryResult["schema"]["tags"][number]["operations"][number];
 
 export type OpenApiPluginOptions = OasPluginConfig;
 
@@ -132,11 +133,11 @@ export const openApiPlugin = (config: OasPluginConfig): ZudokuPlugin => {
         const { type } = config;
         const input = type === "file" ? config.input[version!] : config.input;
 
-        const data = await context.queryClient.ensureQueryData({
-          queryKey: ["sidebar-operations-query", input],
-          queryFn: () =>
-            client.fetch(GetSidebarOperationsQuery, { type, input }),
+        const query = createQuery(client, GetSidebarOperationsQuery, {
+          type,
+          input,
         });
+        const data = await context.queryClient.ensureQueryData(query);
 
         const categories = data.schema.tags.flatMap((tag) => {
           if (!tag.name || tag.operations.length === 0) return [];

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

@@ -1,7 +1,7 @@
-import { AuthState } from "../../authentication/state.js";
-import { ZudokuContext } from "../../core/ZudokuContext.js";
+import { type AuthState } from "../../authentication/state.js";
+import { type ZudokuContext } from "../../core/ZudokuContext.js";
 import type { SchemaImports } from "../../oas/graphql/index.js";
-import { OperationListItemResult } from "./OperationList.js";
+import { type OperationListItemResult } from "./OperationList.js";
 
 type DynamicInput = () => Promise<unknown>;
 
@@ -49,6 +49,7 @@ type BaseOasConfig = {
   options?: {
     examplesLanguage?: string;
     disablePlayground?: boolean;
+    disableSidecar?: boolean;
     showVersionSelect?: "always" | "if-available" | "hide";
     expandAllTags?: boolean;
     transformExamples?: transformExamples;

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

@@ -113,7 +113,7 @@ export const Headers = ({
                       <Autocomplete
                         {...field}
                         placeholder="Name"
-                        className="border-0 shadow-none bg-transparent text-xs font-mono"
+                        className="border-0 shadow-none focus-visible:ring-0 bg-transparent hover:bg-transparent text-xs font-mono"
                         options={[...missingHeaders, ...headerOptions]}
                         onEnterPress={() => handleHeaderEnter(i)}
                         onChange={(e) => {
@@ -166,7 +166,7 @@ export const Headers = ({
                             field.onChange(e);
                             setValue(`headers.${i}.active`, true);
                           }}
-                          className="font-mono text-xs border-0"
+                          className="border-0 shadow-none focus-visible:ring-0 bg-transparent hover:bg-transparent text-xs font-mono"
                         />
                       );
                     }}