fumadocs-openapi 8.1.3 → 8.1.4

package/dist/generate-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-file.d.ts","sourceRoot":"","sources":["../src/generate-file.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,eAAe,EAIrB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,MAAO,SAAQ,eAAe;IAC7C;;OAEG;IACH,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAEzB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,WAAW,CAAC;IAEnC;;OAEG;IACH,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAEtD;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,OAAO,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,CAAC;CACpC;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+HlE"}
+{"version":3,"file":"generate-file.d.ts","sourceRoot":"","sources":["../src/generate-file.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,eAAe,EAIrB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,MAAO,SAAQ,eAAe;IAC7C;;OAEG;IACH,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAEzB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,WAAW,CAAC;IAEnC;;OAEG;IACH,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAEtD;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,OAAO,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,CAAC;CACpC;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmJlE"}

package/dist/generate-file.js

@@ -1,10 +1,9 @@
 import { mkdir, writeFile } from 'node:fs/promises';
-import { dirname, join, parse } from 'node:path';
+import * as path from 'node:path';
 import fg from 'fast-glob';
 import { generateAll, generatePages, generateTags, } from './generate.js';
 export async function generateFiles(options) {
     const { input, output, name: nameFn, per = 'operation', groupBy = 'none', cwd = process.cwd(), } = options;
-    const outputDir = join(cwd, output);
     const urlInputs = [];
     const fileInputs = [];
     for (const v of typeof input === 'string' ? [input] : input) {
@@ -28,7 +27,7 @@ export async function generateFiles(options) {
             file = getFilename(result.pathItem.summary);
         }
         else if (result.type === 'operation') {
-            file = join(getOutputPathFromRoute(result.item.path), result.item.method.toLowerCase());
+            file = path.join(getOutputPathFromRoute(result.item.path), result.item.method.toLowerCase());
         }
         else {
             file = getFilename(result.item.name);
@@ -41,11 +40,11 @@ export async function generateFiles(options) {
                 tags = ['unknown'];
             }
             for (const tag of tags) {
-                outPaths.push(join(outputDir, getFilename(tag), `${file}.mdx`));
+                outPaths.push(path.join(getFilename(tag), `${file}.mdx`));
             }
         }
         else {
-            outPaths.push(join(outputDir, `${file}.mdx`));
+            outPaths.push(`${file}.mdx`);
         }
         return outPaths;
     }
@@ -58,28 +57,41 @@ export async function generateFiles(options) {
         console.log(`Generated Meta: ${file}`);
     }
     async function generateFromDocument(pathOrUrl) {
+        const outputDir = path.join(cwd, output);
         if (per === 'file') {
-            let filename = isUrl(pathOrUrl) ? 'index' : parse(pathOrUrl).name;
+            let filename = isUrl(pathOrUrl)
+                ? 'index'
+                : path.basename(pathOrUrl, path.extname(pathOrUrl));
             if (nameFn)
                 filename = nameFn('file', filename);
-            const outPath = join(outputDir, `${filename}.mdx`);
+            const outPath = path.join(outputDir, `${filename}.mdx`);
             const result = await generateAll(pathOrUrl, options);
             await write(outPath, result);
             console.log(`Generated: ${outPath}`);
         }
         if (per === 'operation') {
             const results = await generatePages(pathOrUrl, options);
+            const mapping = new Map();
             for (const result of results) {
                 const outputPaths = getOutputPaths(result);
-                await Promise.all(outputPaths.map(async (outPath) => {
-                    await write(outPath, result.content);
-                    if (groupBy === 'route' && result.pathItem.summary) {
-                        await writeMetafile(join(dirname(outPath), 'meta.json'), {
-                            title: result.pathItem.summary,
-                        });
-                    }
-                }));
-                console.log(`Generated: ${outputPaths.join(', ')}`);
+                for (const outputPath of outputPaths) {
+                    mapping.set(outputPath, result);
+                }
+            }
+            for (const [key, output] of mapping.entries()) {
+                let outputPath = key;
+                const isSharedDir = Array.from(mapping.keys()).some((item) => item !== outputPath &&
+                    path.dirname(item) === path.dirname(outputPath));
+                if (!isSharedDir && path.dirname(outputPath).length > 0) {
+                    outputPath = path.join(path.dirname(outputPath) + '.mdx');
+                }
+                await write(path.join(outputDir, outputPath), output.content);
+                if (groupBy === 'route' && output.pathItem.summary) {
+                    await writeMetafile(path.join(outputDir, path.dirname(outputPath), 'meta.json'), {
+                        title: output.pathItem.summary,
+                    });
+                }
+                console.log(`Generated: ${outputPath}`);
             }
         }
         if (per === 'tag') {
@@ -87,7 +99,7 @@ export async function generateFiles(options) {
             for (const result of results) {
                 let tagName = result.tag;
                 tagName = nameFn?.('tag', tagName) ?? getFilename(tagName);
-                const outPath = join(outputDir, `${tagName}.mdx`);
+                const outPath = path.join(outputDir, `${tagName}.mdx`);
                 await write(outPath, result.content);
                 console.log(`Generated: ${outPath}`);
             }
@@ -100,15 +112,20 @@ function isUrl(input) {
 }
 function getOutputPathFromRoute(path) {
     return (path
-        .replaceAll('.', '/')
+        .toLowerCase()
+        .replaceAll('.', '-')
         .split('/')
-        .filter((v) => !v.startsWith('{') && !v.endsWith('}'))
-        .at(-1) ?? '');
+        .map((v) => {
+        if (v.startsWith('{') && v.endsWith('}'))
+            return v.slice(1, -1);
+        return v;
+    })
+        .join('/') ?? '');
 }
 function getFilename(s) {
     return s.replace(/\s+/g, '-').toLowerCase();
 }
-async function write(path, content) {
-    await mkdir(dirname(path), { recursive: true });
-    await writeFile(path, content);
+async function write(file, content) {
+    await mkdir(path.dirname(file), { recursive: true });
+    await writeFile(file, content);
 }

package/dist/playground/client.d.ts

@@ -1,7 +1,7 @@
-import { type FC, type HTMLAttributes, type ReactElement, type RefObject } from 'react';
+import { type FC, type HTMLAttributes, type ReactElement } from 'react';
 import type { ControllerFieldState, ControllerRenderProps, FieldPath, UseFormStateReturn } from 'react-hook-form';
 import type { FetchResult } from '../playground/fetcher.js';
-import type { ParameterField, ReferenceSchema, RequestSchema } from '../playground/index.js';
+import type { ParameterField, RequestSchema } from '../playground/index.js';
 import type { Security } from '../utils/get-security.js';
 interface FormValues {
     authorization: string | {
@@ -32,11 +32,12 @@ export type ClientProps = HTMLAttributes<HTMLFormElement> & {
         persistentId: string;
     };
     parameters?: ParameterField[];
-    body?: RequestSchema & {
+    body?: {
+        schema: RequestSchema;
         mediaType: string;
     };
     /**
-     * Resolver for reference schemas you've passed
+     * Resolver for $ref schemas you've passed
      */
     references: Record<string, RequestSchema>;
     proxyUrl?: string;
@@ -51,18 +52,6 @@ export type ClientProps = HTMLAttributes<HTMLFormElement> & {
         }>;
     }>;
 };
-interface SchemaContextType {
-    references: Record<string, RequestSchema>;
-    dynamic: RefObject<Map<string, DynamicField>>;
-}
-export type DynamicField = {
-    type: 'object';
-    properties: string[];
-} | {
-    type: 'field';
-    schema: RequestSchema | ReferenceSchema;
-};
-export declare function useSchemaContext(): SchemaContextType;
 export default function Client({ route, method, authorization, parameters, body, fields, references, proxyUrl, components: { ResultDisplay }, ...rest }: ClientProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=client.d.ts.map

package/dist/playground/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/playground/client.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/playground/client.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EAAE,EAEP,KAAK,cAAc,EAEnB,KAAK,YAAY,EAKlB,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EACV,oBAAoB,EACpB,qBAAqB,EACrB,SAAS,EACT,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAYxE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAYrD,UAAU,UAAU;IAClB,aAAa,EACT,MAAM,GACN;QACE,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACN,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,IAAI,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,WAAW,CAAC,KAAK,SAAS,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI;IACpE,MAAM,EAAE,CAAC,KAAK,EAAE;QACd;;WAEG;QACH,IAAI,EAAE,IAAI,CAAC;QACX,KAAK,EAAE,qBAAqB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAChD,UAAU,EAAE,oBAAoB,CAAC;QACjC,SAAS,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;KAC3C,KAAK,YAAY,CAAC;CACpB;AAED,MAAM,MAAM,WAAW,GAAG,cAAc,CAAC,eAAe,CAAC,GAAG;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,QAAQ,GAAG;QACzB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;IAC9B,IAAI,CAAC,EAAE;QACL,MAAM,EAAE,aAAa,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,MAAM,CAAC,EAAE;QACP,SAAS,CAAC,EAAE,WAAW,CACrB,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,EACnC,cAAc,CACf,CAAC;QACF,IAAI,CAAC,EAAE,WAAW,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QACnD,IAAI,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;KAC3C,CAAC;IAEF,UAAU,CAAC,EAAE,OAAO,CAAC;QACnB,aAAa,EAAE,EAAE,CAAC;YAAE,IAAI,EAAE,WAAW,CAAA;SAAE,CAAC,CAAC;KAC1C,CAAC,CAAC;CACJ,CAAC;AAoBF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,KAAK,EACL,MAAc,EACd,aAAa,EACb,UAAU,EACV,IAAI,EACJ,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EAAE,EAAE,aAAoC,EAAO,EACzD,GAAG,IAAI,EACR,EAAE,WAAW,2CAiHb"}

package/dist/playground/client.js

@@ -1,30 +1,21 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { createContext, Fragment, useContext, useEffect, useMemo, useRef, useState, } from 'react';
+import { Fragment, lazy, useEffect, useMemo, useState, } from 'react';
 import { Controller, FormProvider, useForm, useFormContext, } from 'react-hook-form';
 import { useApiContext, useServerSelectContext } from '../ui/contexts/api.js';
-import { FieldSet, JsonInput, ObjectInput } from './inputs.js';
+import { FieldSet, JsonInput } from './inputs.js';
 import { getStatusInfo } from './status-info.js';
 import { getUrl } from '../utils/server-url.js';
 import { DynamicCodeBlock } from 'fumadocs-ui/components/dynamic-codeblock';
 import { MethodLabel } from '../ui/components/method-label.js';
 import { useQuery } from '../utils/use-query.js';
-import ServerSelect from '../ui/server-select.js';
 import { Collapsible, CollapsibleContent, CollapsibleTrigger, } from 'fumadocs-ui/components/ui/collapsible';
 import { ChevronDown, LoaderCircle } from '../icons.js';
-import { OauthDialog, OauthDialogTrigger, } from '../playground/auth/oauth-dialog.js';
 import { useRequestData } from '../ui/contexts/code-example.js';
 import { useEffectEvent } from 'fumadocs-core/utils/use-effect-event';
 import { buttonVariants } from 'fumadocs-ui/components/ui/button';
 import { cn } from 'fumadocs-ui/utils/cn';
-import { cva } from 'class-variance-authority';
-const SchemaContext = createContext(undefined);
-export function useSchemaContext() {
-    const ctx = useContext(SchemaContext);
-    if (!ctx)
-        throw new Error('Missing provider');
-    return ctx;
-}
+import { SchemaProvider, useResolvedSchema, } from '../playground/schema.js';
 function toRequestData(method, mediaType, value) {
     return {
         path: value.path,
@@ -36,10 +27,11 @@ function toRequestData(method, mediaType, value) {
         query: value.query,
     };
 }
+const ServerSelect = lazy(() => import('../ui/server-select.js'));
 export default function Client({ route, method = 'GET', authorization, parameters, body, fields, references, proxyUrl, components: { ResultDisplay = DefaultResultDisplay } = {}, ...rest }) {
     const { server } = useServerSelectContext();
-    const dynamicRef = useRef(new Map());
     const requestData = useRequestData();
+    const fieldInfoMap = useMemo(() => new Map(), []);
     const authInfo = usePersistentAuthInfo(authorization);
     const defaultValues = useMemo(() => ({
         authorization: authInfo.info,
@@ -63,6 +55,7 @@ export default function Client({ route, method = 'GET', authorization, parameter
         });
     });
     useEffect(() => {
+        fieldInfoMap.clear();
         form.reset(defaultValues);
         // eslint-disable-next-line react-hooks/exhaustive-deps -- update default value
     }, [defaultValues]);
@@ -83,13 +76,11 @@ export default function Client({ route, method = 'GET', authorization, parameter
     const onSubmit = form.handleSubmit((value) => {
         testQuery.start(value);
     });
-    return (_jsx(FormProvider, { ...form, children: _jsx(SchemaContext.Provider, { value: useMemo(() => ({ references: references, dynamic: dynamicRef }), [references]), children: _jsx(AuthProvider, { authorization: authorization, children: _jsxs("form", { ...rest, className: cn('not-prose flex flex-col rounded-xl border shadow-md overflow-hidden bg-fd-card text-fd-card-foreground', rest.className), onSubmit: onSubmit, children: [_jsxs("div", { className: "flex flex-row items-center gap-2 text-sm p-3 pb-0", children: [_jsx(MethodLabel, { children: method }), _jsx(Route, { route: route, className: "flex-1" }), _jsx("button", { type: "submit", className: cn(buttonVariants({ color: 'primary', size: 'sm' }), 'px-3 py-1.5'), disabled: testQuery.isLoading, children: testQuery.isLoading ? (_jsx(LoaderCircle, { className: "size-4 animate-spin" })) : ('Send') })] }), _jsx(FormBody, { body: body, fields: fields, parameters: parameters, authorization: authorization }), testQuery.data ? _jsx(ResultDisplay, { data: testQuery.data }) : null] }) }) }) }));
+    return (_jsx(FormProvider, { ...form, children: _jsx(SchemaProvider, { fieldInfoMap: fieldInfoMap, references: references, children: _jsxs("form", { ...rest, className: cn('not-prose flex flex-col rounded-xl border shadow-md overflow-hidden bg-fd-card text-fd-card-foreground', rest.className), onSubmit: onSubmit, children: [_jsx(ServerSelect, {}), _jsxs("div", { className: "flex flex-row items-center gap-2 text-sm p-3 pb-0", children: [_jsx(MethodLabel, { children: method }), _jsx(Route, { route: route, className: "flex-1" }), _jsx("button", { type: "submit", className: cn(buttonVariants({ color: 'primary', size: 'sm' }), 'px-3 py-1.5'), disabled: testQuery.isLoading, children: testQuery.isLoading ? (_jsx(LoaderCircle, { className: "size-4 animate-spin" })) : ('Send') })] }), _jsx(FormBody, { body: body, fields: fields, parameters: parameters, authorization: authorization }), testQuery.data ? _jsx(ResultDisplay, { data: testQuery.data }) : null, authorization && _jsx(AuthFooter, { authorization: authorization })] }) }) }));
 }
 const paramNames = ['Headers', 'Cookies', 'Query', 'Path'];
 const paramTypes = ['header', 'cookie', 'query', 'path'];
-function FormBody({ authorization, parameters = [], body, fields = {}, }) {
-    const { servers } = useApiContext();
-    const { server, setServer, setServerVariables } = useServerSelectContext();
+function FormBody({ authorization, parameters = [], fields = {}, body, }) {
     const params = useMemo(() => {
         return paramTypes.map((param) => parameters.filter((v) => v.in === param));
     }, [parameters]);
@@ -99,30 +90,25 @@ function FormBody({ authorization, parameters = [], body, fields = {}, }) {
         const schema = authorization.type === 'http' && authorization.scheme === 'basic'
             ? {
                 type: 'object',
-                isRequired: true,
+                required: ['username', 'password'],
                 properties: {
                     username: {
                         type: 'string',
-                        isRequired: true,
                     },
                     password: {
                         type: 'string',
-                        isRequired: true,
                     },
                 },
             }
             : {
                 type: 'string',
-                isRequired: true,
                 description: 'The Authorization access token',
             };
         if (fields?.auth)
             return renderCustomField('authorization', schema, fields.auth);
-        return (_jsxs(_Fragment, { children: [_jsx(FieldSet, { fieldName: "authorization", name: "Authorization", field: schema }), authorization?.type === 'oauth2' && (_jsx(OauthDialogTrigger, { type: "button", className: cn(buttonVariants({
-                        color: 'secondary',
-                    })), children: "Open" }))] }));
+        return (_jsx(FieldSet, { fieldName: "authorization", name: "Authorization", field: schema, isRequired: true }));
     }
-    return (_jsxs(_Fragment, { children: [servers.length > 1 ? (_jsx(CollapsiblePanel, { title: "Server URL", children: _jsx(ServerSelect, { server: server, onServerChanged: setServer, onVariablesChanged: setServerVariables }) })) : null, params.map((param, i) => {
+    return (_jsxs(_Fragment, { children: [params.map((param, i) => {
                 const name = paramNames[i];
                 const type = paramTypes[i];
                 if (type !== 'header' && param.length === 0)
@@ -131,37 +117,46 @@ function FormBody({ authorization, parameters = [], body, fields = {}, }) {
                     return;
                 return (_jsxs(CollapsiblePanel, { title: name, children: [type === 'header' ? renderAuth() : null, param.map((field) => {
                             const fieldName = `${type}.${field.name}`;
-                            if (!fields?.parameter) {
-                                return (_jsx(FieldSet, { name: field.name, fieldName: fieldName, field: field }, fieldName));
+                            if (fields?.parameter) {
+                                return renderCustomField(fieldName, field.schema, fields.parameter, field.name);
                             }
-                            return renderCustomField(fieldName, field, fields.parameter, field.name);
+                            return (_jsx(FieldSet, { name: field.name, fieldName: fieldName, field: field.schema }, fieldName));
                         })] }, name));
-            }), body ? (fields.body ? (_jsx(CollapsiblePanel, { title: "Body", children: renderCustomField('body', body, fields.body) })) : (_jsx(BodyInput, { field: body }))) : null] }));
+            }), body ? (fields.body ? (_jsx(CollapsiblePanel, { title: "Body", children: renderCustomField('body', body.schema, fields.body) })) : (_jsx(BodyInput, { field: body.schema }))) : null] }));
 }
-const bodyTypeVariants = cva('p-1 rounded-lg font-medium text-xs transition-colors', {
-    variants: {
-        active: {
-            true: 'bg-fd-primary/10 text-fd-primary',
-            false: 'text-fd-muted-foreground',
-        },
-    },
-});
-function BodyInput({ field }) {
+function BodyInput({ field: _field }) {
+    const field = useResolvedSchema(_field);
     const [isJson, setIsJson] = useState(false);
-    return (_jsxs(CollapsiblePanel, { title: "Body", children: [_jsxs("div", { className: "grid grid-cols-2 border bg-fd-muted rounded-lg", children: [_jsx("button", { className: cn(bodyTypeVariants({ active: !isJson })), onClick: () => setIsJson(false), type: "button", children: "Simple" }), _jsx("button", { className: cn(bodyTypeVariants({ active: isJson })), onClick: () => setIsJson(true), type: "button", children: "JSON Mode" })] }), isJson ? (_jsx(JsonInput, { fieldName: "body" })) : field.type === 'object' ? (_jsx(ObjectInput, { field: field, fieldName: "body" })) : (_jsx(FieldSet, { field: field, fieldName: "body" }))] }));
+    return (_jsx(CollapsiblePanel, { title: "Body", children: isJson ? (_jsx(JsonInput, { fieldName: "body", children: _jsx("button", { className: cn(buttonVariants({
+                    color: 'ghost',
+                    size: 'sm',
+                    className: 'p-2',
+                })), onClick: () => setIsJson(false), type: "button", children: "Close JSON Editor" }) })) : (_jsx(FieldSet, { field: field, fieldName: "body", name: _jsx("button", { className: cn(buttonVariants({
+                    color: 'secondary',
+                    size: 'sm',
+                    className: 'p-2',
+                })), onClick: () => setIsJson(true), type: "button", children: "Open JSON Editor" }) })) }));
 }
 function renderCustomField(fieldName, info, field, key) {
     return (_jsx(Controller, { 
         // @ts-expect-error we use string here
         render: (props) => field.render({ ...props, info }), name: fieldName }, key));
 }
-function AuthProvider({ authorization, children, }) {
+const OauthDialog = lazy(() => import('./auth/oauth-dialog.js').then((mod) => ({
+    default: mod.OauthDialog,
+})));
+const OauthDialogTrigger = lazy(() => import('./auth/oauth-dialog.js').then((mod) => ({
+    default: mod.OauthDialogTrigger,
+})));
+function AuthFooter({ authorization }) {
     const form = useFormContext();
-    if (!authorization || authorization.type !== 'oauth2')
-        return children;
+    if (authorization.type !== 'oauth2')
+        return;
     // only the first one, so it looks simpler :)
     const flow = Object.keys(authorization.flows)[0];
-    return (_jsx(OauthDialog, { flow: flow, scheme: authorization, setToken: (token) => form.setValue('authorization', `Bearer ${token}`), children: children }));
+    return (_jsx(OauthDialog, { flow: flow, scheme: authorization, setToken: (token) => form.setValue('authorization', `Bearer ${token}`), children: _jsx(OauthDialogTrigger, { type: "button", className: cn(buttonVariants({
+                color: 'secondary',
+            })), children: "Auth Settings" }) }));
 }
 function Route({ route, ...props }) {
     const segments = route.split('/').filter((part) => part.length > 0);
@@ -170,7 +165,7 @@ function Route({ route, ...props }) {
 function DefaultResultDisplay({ data }) {
     const statusInfo = useMemo(() => getStatusInfo(data.status), [data.status]);
     const { shikiOptions } = useApiContext();
-    return (_jsxs("div", { className: "flex flex-col gap-3 rounded-lg border bg-fd-card p-4", children: [_jsxs("div", { className: "inline-flex items-center gap-1.5 text-sm font-medium text-fd-foreground", children: [_jsx(statusInfo.icon, { className: cn('size-4', statusInfo.color) }), statusInfo.description] }), _jsx("p", { className: "text-sm text-fd-muted-foreground", children: data.status }), data.data ? (_jsx(DynamicCodeBlock, { lang: typeof data.data === 'string' && data.data.length > 50000
+    return (_jsxs("div", { className: "flex flex-col gap-3 border-t p-3", children: [_jsxs("div", { className: "inline-flex items-center gap-1.5 text-sm font-medium text-fd-foreground", children: [_jsx(statusInfo.icon, { className: cn('size-4', statusInfo.color) }), statusInfo.description] }), _jsx("p", { className: "text-sm text-fd-muted-foreground", children: data.status }), data.data ? (_jsx(DynamicCodeBlock, { lang: typeof data.data === 'string' && data.data.length > 50000
                     ? 'text'
                     : data.type, code: typeof data.data === 'string'
                     ? data.data

package/dist/playground/get-default-values.d.ts

@@ -1,3 +1,3 @@
-import type { ReferenceSchema, RequestSchema } from '../playground/index.js';
-export declare function getDefaultValue(item: RequestSchema | ReferenceSchema, references: Record<string, RequestSchema>): unknown;
+import type { RequestSchema } from '../playground/index.js';
+export declare function getDefaultValue(schema: RequestSchema): unknown;
 //# sourceMappingURL=get-default-values.d.ts.map

package/dist/playground/get-default-values.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-default-values.d.ts","sourceRoot":"","sources":["../../src/playground/get-default-values.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGzE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,aAAa,GAAG,eAAe,EACrC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GACxC,OAAO,CA2BT"}
+{"version":3,"file":"get-default-values.d.ts","sourceRoot":"","sources":["../../src/playground/get-default-values.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,wBAAgB,eAAe,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CA2B9D"}

package/dist/playground/get-default-values.js

@@ -1,28 +1,27 @@
-import { resolve } from '../playground/resolve.js';
-export function getDefaultValue(item, references) {
-    if (item.type === 'ref')
-        return getDefaultValue(resolve(item, references), references);
-    if (item.type === 'object')
-        return Object.fromEntries(Object.entries(item.properties).map(([key, prop]) => [
-            key,
-            getDefaultValue(prop.type === 'ref' ? references[prop.schema] : prop, references),
-        ]));
-    if (item.type === 'array')
+export function getDefaultValue(schema) {
+    if (typeof schema === 'boolean')
+        return null;
+    const type = schema.type;
+    if (Array.isArray(type))
+        return getDefaultValue({
+            ...schema,
+            type: type[0],
+        });
+    if (type === 'object' && typeof schema === 'object')
+        return Object.fromEntries(Object.entries(schema.properties ?? {}).map(([key, prop]) => {
+            return [key, getDefaultValue(prop)];
+        }));
+    if (type === 'array')
         return [];
-    if (item.type === 'null')
+    if (type === 'null')
         return null;
-    if (item.type === 'switcher') {
-        const first = Object.values(item.items).at(0);
-        if (!first)
-            return '';
-        return getDefaultValue(resolve(first, references), references);
-    }
-    if (item.type === 'file')
-        return undefined;
-    if (item.type === 'string')
+    if (type === 'string') {
+        if (typeof schema === 'object' && schema.format === 'binary')
+            return undefined;
         return '';
-    if (item.type === 'number')
+    }
+    if (type === 'number' || type === 'integer')
         return 0;
-    if (item.type === 'boolean')
+    if (type === 'boolean')
         return false;
 }

package/dist/playground/index.d.ts

@@ -1,47 +1,13 @@
 import type { MethodInformation, RenderContext } from '../types.js';
+import { type ParsedSchema } from '../utils/schema.js';
 import { type ClientProps } from './client.js';
-interface BaseSchema {
-    description?: string;
-    isRequired: boolean;
-}
-export type ParameterField = (PrimitiveSchema | ArraySchema) & {
+export type ParameterField = {
     name: string;
     description?: string;
+    schema: ParsedSchema;
     in: 'cookie' | 'header' | 'query' | 'path';
 };
-interface PrimitiveSchema extends BaseSchema {
-    type: 'boolean' | 'string' | 'number';
-}
-export interface ReferenceSchema extends BaseSchema {
-    type: 'ref';
-    schema: string;
-}
-interface ArraySchema extends BaseSchema {
-    type: 'array';
-    /**
-     * Reference to item schema or the schema
-     */
-    items: string | RequestSchema;
-}
-interface FileSchema extends BaseSchema {
-    type: 'file';
-}
-interface ObjectSchema extends BaseSchema {
-    type: 'object';
-    properties: Record<string, RequestSchema | ReferenceSchema>;
-    /**
-     * Reference to schema, or true if it's `any`
-     */
-    additionalProperties?: boolean | string;
-}
-interface SwitcherSchema extends BaseSchema {
-    type: 'switcher';
-    items: Record<string, ReferenceSchema | RequestSchema>;
-}
-interface NullSchema extends BaseSchema {
-    type: 'null';
-}
-export type RequestSchema = PrimitiveSchema | ArraySchema | ObjectSchema | SwitcherSchema | NullSchema | FileSchema;
+export type RequestSchema = ParsedSchema;
 export interface APIPlaygroundProps {
     path: string;
     method: MethodInformation;

package/dist/playground/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/playground/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAEjB,aAAa,EACd,MAAM,SAAS,CAAC;AAOjB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C,UAAU,UAAU;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,MAAM,cAAc,GAAG,CAAC,eAAe,GAAG,WAAW,CAAC,GAAG;IAC7D,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,EAAE,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;CAC5C,CAAC;AAEF,UAAU,eAAgB,SAAQ,UAAU;IAC1C,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACvC;AAED,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,WAAY,SAAQ,UAAU;IACtC,IAAI,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;CAC/B;AAED,UAAU,UAAW,SAAQ,UAAU;IACrC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,YAAa,SAAQ,UAAU;IACvC,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,eAAe,CAAC,CAAC;IAE5D;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CACzC;AAED,UAAU,cAAe,SAAQ,UAAU;IACzC,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,aAAa,CAAC,CAAC;CACxD;AAED,UAAU,UAAW,SAAQ,UAAU;IACrC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,aAAa,GACrB,eAAe,GACf,WAAW,GACX,YAAY,GACZ,cAAc,GACd,UAAU,GACV,UAAU,CAAC;AAUf,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,GAAG,EAAE,aAAa,CAAC;IAEnB,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/B;AAED,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzD,wBAAsB,aAAa,CAAC,EAClC,IAAI,EACJ,MAAM,EACN,GAAG,EACH,MAAM,GACP,EAAE,kBAAkB,oDAsCpB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/playground/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,EAAE,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,YAAY,CAAC;AAUzC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,GAAG,EAAE,aAAa,CAAC;IAEnB,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/B;AAED,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzD,wBAAsB,aAAa,CAAC,EAClC,IAAI,EACJ,MAAM,EACN,GAAG,EACH,MAAM,GACP,EAAE,kBAAkB,oDAyCpB"}