zudoku 0.0.0-reset-hash-value.ac516c6d → 0.0.0-z06bf8c86

package/dist/lib/plugins/openapi/schema/SchemaView.js

@@ -1,21 +1,28 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { InfoIcon } from "lucide-react";
+import { Fragment } from "react";
+import { Frame, FrameDescription, FrameFooter, FrameHeader, FramePanel, } from "zudoku/ui/Frame.js";
+import { ItemGroup, ItemSeparator } from "zudoku/ui/Item.js";
 import { Markdown } from "../../../components/Markdown.js";
-import { Card } from "../../../ui/Card.js";
 import { groupBy } from "../../../util/groupBy.js";
 import { ConstValue } from "../components/ConstValue.js";
 import { EnumValues } from "../components/EnumValues.js";
 import { ParamInfos } from "../ParamInfos.js";
-import { AllOfGroupView } from "./AllOfGroup/AllOfGroupView.js";
 import { SchemaExampleAndDefault } from "./SchemaExampleAndDefault.js";
 import { SchemaPropertyItem } from "./SchemaPropertyItem.js";
 import { UnionView } from "./UnionView.js";
-import { isBasicType } from "./utils.js";
+import { isArrayType, isBasicType } from "./utils.js";
 const renderMarkdown = (content) => content && (_jsx(Markdown, { className: "text-sm leading-normal line-clamp-4", content: content }));
-const renderBasicSchema = (schema, cardHeader) => (_jsxs(Card, { className: "overflow-hidden", children: [cardHeader, _jsxs("div", { className: "p-4 space-y-2", children: [_jsx("span", { className: "text-sm text-muted-foreground", children: _jsx(ParamInfos, { schema: schema }) }), schema.enum && _jsx(EnumValues, { values: schema.enum }), renderMarkdown(schema.description), _jsx(SchemaExampleAndDefault, { schema: schema })] })] }));
+const renderBasicSchema = (schema, cardHeader, embedded) => {
+    const content = (_jsxs(_Fragment, { children: [_jsx("span", { className: "text-sm text-muted-foreground", children: _jsx(ParamInfos, { schema: schema }) }), schema.enum && _jsx(EnumValues, { values: schema.enum }), renderMarkdown(schema.description), _jsx(SchemaExampleAndDefault, { schema: schema })] }));
+    if (embedded) {
+        return _jsx("div", { className: "space-y-2 p-4", children: content });
+    }
+    return (_jsxs(Frame, { children: [cardHeader, _jsx(FramePanel, { className: "space-y-2", children: content })] }));
+};
 export const SchemaView = ({ schema, defaultOpen = false, cardHeader, embedded, }) => {
     if (!schema || Object.keys(schema).length === 0) {
-        return (_jsxs(Card, { className: "overflow-hidden", children: [cardHeader, _jsx("div", { className: "text-sm text-muted-foreground italic p-4", children: "No data returned" })] }));
+        return (_jsxs(Frame, { children: [cardHeader, _jsx(FramePanel, { children: _jsx("div", { className: "text-sm text-muted-foreground italic", children: "No data returned" }) })] }));
     }
     if (schema.const) {
         return _jsx(ConstValue, { schema: schema });
@@ -23,15 +30,18 @@ export const SchemaView = ({ schema, defaultOpen = false, cardHeader, embedded,
     if (Array.isArray(schema.oneOf) || Array.isArray(schema.anyOf)) {
         return _jsx(UnionView, { schema: schema, cardHeader: cardHeader });
     }
-    if (Array.isArray(schema.allOf)) {
-        return _jsx(AllOfGroupView, { schema: schema, cardHeader: cardHeader });
-    }
     if (isBasicType(schema.type)) {
-        return renderBasicSchema(schema, cardHeader);
+        return renderBasicSchema(schema, cardHeader, embedded);
     }
-    if (schema.type === "array" && typeof schema.items === "object") {
-        return _jsx(SchemaView, { schema: schema.items, cardHeader: cardHeader });
+    if (isArrayType(schema) && typeof schema.items === "object") {
+        const wrappedSchema = {
+            type: "object",
+            properties: { "": schema },
+        };
+        return (_jsx(SchemaView, { schema: wrappedSchema, cardHeader: cardHeader, defaultOpen: true }));
     }
+    const additionalObjectProperties = typeof schema.additionalProperties ===
+        "object" && _jsx(SchemaView, { schema: schema.additionalProperties, embedded: true });
     if (schema.type === "object") {
         const groupedProperties = groupBy(Object.entries(schema.properties ?? {}), ([propertyName, property]) => {
             return property.deprecated
@@ -41,10 +51,15 @@ export const SchemaView = ({ schema, defaultOpen = false, cardHeader, embedded,
                     : "optional";
         });
         const groupNames = ["required", "optional", "deprecated"];
-        const additionalProperties = typeof schema.additionalProperties === "object" ? (_jsx(SchemaView, { schema: schema.additionalProperties, embedded: true })) : schema.additionalProperties === true ? (_jsxs("div", { className: "text-sm p-4 bg-border/20 hover:bg-border/30 flex items-center gap-1", children: [_jsx("span", { children: "Additional properties are allowed" }), _jsx("a", { className: "p-0.5 -m-0.5", href: "https://swagger.io/docs/specification/v3_0/data-models/dictionaries/", rel: "noopener noreferrer", target: "_blank", children: _jsx(InfoIcon, { size: 14 }) })] })) : null;
-        const Component = embedded ? "div" : Card;
-        return (_jsxs(Component, { className: "divide-y overflow-hidden", children: [cardHeader, groupNames.map((group) => groupedProperties[group] && (_jsx("ul", { className: "divide-y", children: groupedProperties[group].map(([name, schema]) => (_jsx(SchemaPropertyItem, { name: name, schema: schema, group: group, defaultOpen: defaultOpen }, name))) }, group))), additionalProperties] }));
+        const groups = groupNames.flatMap((group) => {
+            const properties = groupedProperties[group];
+            return properties ? { group, properties } : [];
+        });
+        const itemsList = groups.map(({ group, properties }, index) => (_jsxs(Fragment, { children: [index > 0 && _jsx(ItemSeparator, {}), _jsx(ItemGroup, { className: "overflow-clip", children: properties.map(([name, schema], index) => (_jsxs(Fragment, { children: [index > 0 && _jsx(ItemSeparator, {}), _jsx(SchemaPropertyItem, { name: name, schema: schema, group: group, defaultOpen: defaultOpen })] }, name))) })] }, group)));
+        if (embedded) {
+            return itemsList;
+        }
+        return (_jsxs(Frame, { children: [cardHeader, schema.description && (_jsx(FrameHeader, { children: _jsx(FrameDescription, { children: schema.description }) })), (itemsList.length > 0 || additionalObjectProperties) && (_jsxs(FramePanel, { className: "p-0!", children: [itemsList, additionalObjectProperties] })), schema.additionalProperties === true && (_jsx(FrameFooter, { children: _jsxs("a", { className: "text-sm flex items-center gap-1 hover:underline", href: "https://swagger.io/docs/specification/v3_0/data-models/dictionaries/", rel: "noopener noreferrer", target: "_blank", children: ["Additional properties are allowed", _jsx(InfoIcon, { size: 14 })] }) }))] }));
     }
-    return null;
 };
 //# sourceMappingURL=SchemaView.js.map

package/dist/lib/plugins/openapi/schema/SchemaView.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaView.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/schema/SchemaView.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"SchemaView.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/schema/SchemaView.tsx"],"names":[],"mappings":"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"}

package/dist/lib/plugins/openapi/schema/UnionView.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState } from "react";
 import { Badge } from "../../../ui/Badge.js";
-import { Card } from "../../../ui/Card.js";
+import { Frame, FramePanel } from "../../../ui/Frame.js";
 import { cn } from "../../../util/cn.js";
 import { SchemaView } from "./SchemaView.js";
 import { decideExclusivity, labelForVariant, quickGuards, unionVariants, } from "./union-helpers.js";
@@ -14,9 +14,6 @@ const DecisionTable = ({ variants, schema, selectedVariant, onSelectVariant, })
                                             ? row.guards.join(" · ")
                                             : "No specific criteria" })] }, row.label))) })] }) })] }));
 };
-const VariantPanel = ({ variant }) => {
-    return (_jsxs("div", { className: "space-y-2", children: [variant.description && (_jsx("p", { className: "text-sm text-muted-foreground", children: variant.description })), _jsx(SchemaView, { schema: variant })] }));
-};
 export const UnionView = ({ schema, cardHeader, }) => {
     const mode = Array.isArray(schema.oneOf)
         ? "oneOf"
@@ -31,6 +28,6 @@ export const UnionView = ({ schema, cardHeader, }) => {
     const semanticsMessage = exclusivity === "exactly-one" ? (_jsxs(_Fragment, { children: ["Exactly one variant ", _jsx("b", { children: "must match" }), "."] })) : (_jsxs(_Fragment, { children: ["At least one variant ", _jsx("b", { children: "must match" }), ". Multiple variants", " ", _jsx("i", { children: "may match" }), " simultaneously."] }));
     const currentVariantIndex = variants.findIndex((v, i) => labelForVariant(i, v) === selectedVariant);
     const currentVariant = currentVariantIndex >= 0 ? variants[currentVariantIndex] : null;
-    return (_jsxs(Card, { className: "overflow-hidden text-sm", children: [cardHeader, _jsxs("div", { className: "flex flex-col gap-4 p-4", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Badge, { variant: "outline", children: mode }), _jsx("div", { className: "flex-1 p-2", children: _jsx("span", { className: "text-sm", children: semanticsMessage }) })] }), _jsx(DecisionTable, { variants: variants, schema: schema, selectedVariant: selectedVariant, onSelectVariant: setSelectedVariant }), _jsxs("strong", { children: ["Properties for ", selectedVariant, ":"] }), currentVariant && _jsx(VariantPanel, { variant: currentVariant })] })] }));
+    return (_jsxs(Frame, { children: [cardHeader, _jsxs(FramePanel, { className: "text-sm flex flex-col gap-4", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Badge, { variant: "outline", children: mode }), _jsx("div", { className: "flex-1 p-2", children: _jsx("span", { className: "text-sm", children: semanticsMessage }) })] }), _jsx(DecisionTable, { variants: variants, schema: schema, selectedVariant: selectedVariant, onSelectVariant: setSelectedVariant }), _jsxs("strong", { children: ["Properties for ", selectedVariant, ":"] }), currentVariant && _jsx(SchemaView, { schema: currentVariant })] })] }));
 };
 //# sourceMappingURL=UnionView.js.map

package/dist/lib/plugins/openapi/schema/UnionView.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnionView.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/schema/UnionView.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"UnionView.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/schema/UnionView.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,aAAa,GACd,MAAM,oBAAoB,CAAC;AAE5B,MAAM,aAAa,GAAG,CAAC,EACrB,QAAQ,EACR,MAAM,EACN,eAAe,EACf,eAAe,GAMhB,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACnC,KAAK,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,EAAE,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC;KAC/B,CAAC,CAAC,CAAC;IAEJ,OAAO,CACL,eAAK,SAAS,EAAC,6BAA6B,aAC1C,aAAI,SAAS,EAAC,aAAa,+BAAoB,EAC/C,cAAK,SAAS,EAAC,mCAAmC,YAChD,iBAAO,SAAS,EAAC,QAAQ,aACvB,0BACE,cAAI,SAAS,EAAC,sBAAsB,aAClC,aAAI,SAAS,EAAC,2BAA2B,wBAAa,EACtD,aAAI,SAAS,EAAC,2BAA2B,kCAAuB,IAC7D,GACC,EACR,gBAAO,SAAS,EAAC,UAAU,YACxB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CACjB,cAAoB,SAAS,EAAC,mBAAmB,aAC/C,aAAI,SAAS,EAAC,iBAAiB,YAC7B,iBACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,EAAE,CACX,iBAAiB,EACjB,eAAe,KAAK,GAAG,CAAC,KAAK,IAAI,cAAc,CAChD,EACD,OAAO,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,YAExC,GAAG,CAAC,KAAK,GACH,GACN,EACL,aAAI,SAAS,EAAC,mCAAmC,YAC9C,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;4CACpB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;4CACxB,CAAC,CAAC,sBAAsB,GACvB,KAjBE,GAAG,CAAC,KAAK,CAkBb,CACN,CAAC,GACI,IACF,GACJ,IACF,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EACxB,MAAM,EACN,UAAU,GAIX,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACtC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YAC3B,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnD,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAC1D,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CACnD,CAAC;IAEF,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAE9C,MAAM,gBAAgB,GACpB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,CAC9B,sDACsB,qCAAiB,SACpC,CACJ,CAAC,CAAC,CAAC,CACF,uDACuB,qCAAiB,yBAAoB,GAAG,EAC7D,oCAAgB,wBACf,CACJ,CAAC;IAEJ,MAAM,mBAAmB,GAAG,QAAQ,CAAC,SAAS,CAC5C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,eAAe,CACpD,CAAC;IACF,MAAM,cAAc,GAClB,mBAAmB,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAElE,OAAO,CACL,MAAC,KAAK,eACH,UAAU,EACX,MAAC,UAAU,IAAC,SAAS,EAAC,6BAA6B,aACjD,eAAK,SAAS,EAAC,yBAAyB,aACtC,KAAC,KAAK,IAAC,OAAO,EAAC,SAAS,YAAE,IAAI,GAAS,EACvC,cAAK,SAAS,EAAC,YAAY,YACzB,eAAM,SAAS,EAAC,SAAS,YAAE,gBAAgB,GAAQ,GAC/C,IACF,EAEN,KAAC,aAAa,IACZ,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,kBAAkB,GACnC,EACF,gDAAwB,eAAe,SAAW,EACjD,cAAc,IAAI,KAAC,UAAU,IAAC,MAAM,EAAE,cAAc,GAAI,IAC9C,IACP,CACT,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/plugins/openapi/schema/union-helpers.js

@@ -7,7 +7,6 @@ export const unionVariants = (schema) => {
             // If variant doesn't define its own properties or type, inherit from parent
             const shouldInherit = !variant.properties &&
                 !variant.type &&
-                !variant.allOf &&
                 !variant.oneOf &&
                 !variant.anyOf;
             if (shouldInherit) {

package/dist/lib/plugins/openapi/schema/union-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"union-helpers.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/schema/union-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"union-helpers.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/schema/union-helpers.ts"],"names":[],"mappings":"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"}

package/dist/lib/plugins/openapi/schema/utils.d.ts

@@ -1,6 +1,6 @@
-import type { SchemaObject } from "../../../oas/parser/index.js";
+import type { ArraySchemaObject, SchemaObject } from "../../../oas/parser/index.js";
 export declare const isBasicType: (type: unknown) => type is "string" | "number" | "boolean" | "integer" | "null";
-export declare const isArrayType: (value: SchemaObject) => boolean;
+export declare const isArrayType: (value: SchemaObject) => value is ArraySchemaObject;
 export declare const isComplexType: (value?: SchemaObject) => boolean | undefined;
 export declare const isCircularRef: (schema: unknown) => schema is string;
 export declare const isArrayCircularRef: (schema: SchemaObject) => schema is SchemaObject & {

package/dist/lib/plugins/openapi/schema/utils.js

@@ -1,4 +1,4 @@
-import { CIRCULAR_REF } from "../../../oas/graphql/circular.js";
+import { CIRCULAR_REF, SCHEMA_REF_PREFIX, } from "../../../oas/graphql/circular.js";
 export const isBasicType = (type) => (typeof type === "string" &&
     ["string", "number", "boolean", "integer", "null"].includes(type)) ||
     (Array.isArray(type) && type.every(isBasicType));
@@ -11,7 +11,15 @@ export const isComplexType = (value) => value &&
         (value.type === "array" &&
             typeof value.items === "object" &&
             (!value.items.type || value.items.type === "object")));
-export const isCircularRef = (schema) => typeof schema === "string" && schema.startsWith(CIRCULAR_REF);
+export const isCircularRef = (schema) => typeof schema === "string" &&
+    (schema.startsWith(CIRCULAR_REF) || schema.startsWith(SCHEMA_REF_PREFIX));
 export const isArrayCircularRef = (schema) => isArrayType(schema) && "items" in schema && isCircularRef(schema.items);
-export const extractCircularRefInfo = (ref) => typeof ref === "string" ? ref.split(":")[1] : undefined;
+export const extractCircularRefInfo = (ref) => {
+    if (typeof ref !== "string")
+        return undefined;
+    if (ref.startsWith(SCHEMA_REF_PREFIX)) {
+        return ref.slice(SCHEMA_REF_PREFIX.length).split("/").pop();
+    }
+    return ref.split(":")[1];
+};
 //# sourceMappingURL=utils.js.map

package/dist/lib/plugins/openapi/schema/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/schema/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAa,EACiD,EAAE,CAChE,CAAC,OAAO,IAAI,KAAK,QAAQ;IACvB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;AAEnD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAmB,EAAE,EAAE,CACjD,KAAK,CAAC,IAAI,KAAK,OAAO;IACtB,wFAAwF;IACxF,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;AAE9D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAoB,EAAE,EAAE,CACpD,KAAK;IACL,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ;QACvB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/C,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO;YACrB,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;YAC/B,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAe,EAAoB,EAAE,CACjE,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAoB,EAC8B,EAAE,CACpD,WAAW,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,MAAM,IAAI,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAE1E,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,GAA2B,EACP,EAAE,CACtB,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/schema/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,iBAAiB,GAClB,MAAM,kCAAkC,CAAC;AAM1C,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAa,EACiD,EAAE,CAChE,CAAC,OAAO,IAAI,KAAK,QAAQ;IACvB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;AAEnD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAmB,EAA8B,EAAE,CAC7E,KAAK,CAAC,IAAI,KAAK,OAAO;IACtB,wFAAwF;IACxF,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;AAE9D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAoB,EAAE,EAAE,CACpD,KAAK;IACL,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ;QACvB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/C,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO;YACrB,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;YAC/B,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAe,EAAoB,EAAE,CACjE,OAAO,MAAM,KAAK,QAAQ;IAC1B,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAE5E,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAoB,EAC8B,EAAE,CACpD,WAAW,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,MAAM,IAAI,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAE1E,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,GAA2B,EACP,EAAE;IACtB,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAE9C,IAAI,GAAG,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,OAAO,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IAC9D,CAAC;IAED,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC"}

package/dist/lib/plugins/openapi/util/createHttpSnippet.js

@@ -1,9 +1,32 @@
 import { HTTPSnippet } from "@zudoku/httpsnippet";
+const toFormDataParams = (text) => {
+    const stringify = (v) => typeof v === "string" ? v : JSON.stringify(v);
+    try {
+        const obj = text && JSON.parse(text);
+        if (typeof obj !== "object" || !obj)
+            return [];
+        return Object.entries(obj).flatMap(([name, value]) => {
+            const values = Array.isArray(value) ? value : [value];
+            return values.map((v) => ({ name, value: stringify(v) }));
+        });
+    }
+    catch {
+        return [];
+    }
+};
 export const createHttpSnippet = ({ operation, selectedServer, exampleBody, }) => {
+    const isMultipart = exampleBody.mimeType === "multipart/form-data" ||
+        exampleBody.mimeType === "application/x-www-form-urlencoded";
+    const postData = isMultipart
+        ? {
+            mimeType: exampleBody.mimeType,
+            params: toFormDataParams(exampleBody.text),
+        }
+        : exampleBody;
     return new HTTPSnippet({
         method: operation.method.toUpperCase(),
         url: selectedServer + operation.path.replaceAll("{", ":").replaceAll("}", ""),
-        postData: exampleBody,
+        postData,
         headers: [
             ...(exampleBody.text
                 ? [{ name: "Content-Type", value: exampleBody.mimeType }]

package/dist/lib/plugins/openapi/util/createHttpSnippet.js.map

@@ -1 +1 @@
-{"version":3,"file":"createHttpSnippet.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/util/createHttpSnippet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createHttpSnippet.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/util/createHttpSnippet.ts"],"names":[],"mappings":"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"}

package/dist/lib/plugins/openapi/util/generateSchemaExample.js

@@ -65,21 +65,19 @@ export const generateSchemaExample = (schema, name) => {
     if (schema.enum) {
         return schema.enum[0];
     }
-    if (schema.oneOf) {
-        const randomIndex = Math.floor(Math.random() * schema.oneOf.length);
-        return generateSchemaExample(schema.oneOf[randomIndex]);
+    if (schema.oneOf && schema.oneOf.length > 0) {
+        return generateSchemaExample(schema.oneOf[0]);
     }
-    if (schema.anyOf) {
+    if (schema.anyOf && schema.anyOf.length > 0) {
         // Should likely be expanded to return a partial set of values, but it would require
         // detection if being used within an array or a string type.
-        const randomIndex = Math.floor(Math.random() * schema.anyOf.length);
-        return generateSchemaExample(schema.anyOf[randomIndex]);
+        return generateSchemaExample(schema.anyOf[0]);
     }
-    if (schema.allOf) {
-        // https://swagger.io/docs/specification/v3_0/data-models/oneof-anyof-allof-not/#allof
-        return schema.allOf.reduce((acc, allOfSchema) => {
-            return { ...acc, ...generateSchemaExample(allOfSchema) };
-        }, {});
+    // Check for property-level examples
+    if (schema.examples &&
+        Array.isArray(schema.examples) &&
+        schema.examples.length > 0) {
+        return schema.examples[0];
     }
     switch (schema.type) {
         case "string":

package/dist/lib/plugins/openapi/util/generateSchemaExample.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateSchemaExample.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/util/generateSchemaExample.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generateSchemaExample.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/util/generateSchemaExample.ts"],"names":[],"mappings":"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"}

package/dist/lib/plugins/openapi/util/getRoutes.d.ts

@@ -2,7 +2,15 @@ import { type RouteObject } from "react-router";
 import type { GraphQLClient } from "../client/GraphQLClient.js";
 import { type OpenApiPluginOptions } from "../index.js";
 import type { OasPluginConfig } from "../interfaces.js";
-export declare const getVersions: (config: OasPluginConfig) => string[];
+export declare const getVersionMetadata: (config: OasPluginConfig) => {
+    versions: string[];
+    labels: {
+        [k: string]: string;
+    };
+    downloadUrls: {
+        [k: string]: string | undefined;
+    };
+};
 export declare const getRoutes: ({ basePath, config, client, }: {
     client: GraphQLClient;
     config: OpenApiPluginOptions;

package/dist/lib/plugins/openapi/util/getRoutes.js

@@ -80,12 +80,41 @@ const createVersionRoutes = (versionPath, tagPages) => {
         ...createAdditionalRoutes(versionPath),
     ];
 };
-export const getVersions = (config) => config.type === "file" ? Object.keys(config.input) : [];
+export const getVersionMetadata = (config) => {
+    if (config.type === "raw" || !Array.isArray(config.input)) {
+        return { versions: [], labels: {}, downloadUrls: {} };
+    }
+    return {
+        versions: config.input.map((v) => v.path),
+        labels: Object.fromEntries(config.input.map((v) => [v.path, v.label ?? v.path])),
+        downloadUrls: Object.fromEntries(config.input.map((v) => [v.path, v.downloadUrl])),
+    };
+};
 export const getRoutes = ({ basePath, config, client, }) => {
     const tagPages = config.tagPages;
+    const { versions } = getVersionMetadata(config);
     // If the config does not provide tag pages the catch-all
     // route handles all operations on a single page
     if (!tagPages) {
+        // If there are versions, create versioned routes even without tag pages
+        if (versions.length > 0) {
+            const versionsInPath = versions.length > 1 ? [undefined, ...versions] : [undefined];
+            return versionsInPath.map((version) => {
+                const versionPath = joinUrl(basePath, version);
+                return createOasProvider({
+                    basePath,
+                    version,
+                    routePath: versionPath,
+                    routes: [
+                        createNonTagPagesRoute({ path: `${versionPath}/:tag?` }),
+                        ...createAdditionalRoutes(versionPath),
+                    ],
+                    client,
+                    config,
+                });
+            });
+        }
+        // No versions, single route
         return [
             createOasProvider({
                 basePath,
@@ -99,7 +128,6 @@ export const getRoutes = ({ basePath, config, client, }) => {
             }),
         ];
     }
-    const versions = getVersions(config);
     // The latest version always is added as index path
     const versionsInPath = versions.length > 1 ? [undefined, ...versions] : [undefined];
     return versionsInPath.map((version) => {

package/dist/lib/plugins/openapi/util/getRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"getRoutes.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/util/getRoutes.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"getRoutes.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/openapi/util/getRoutes.tsx"],"names":[],"mappings":"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"}

package/dist/lib/plugins/search-pagefind/IndexingDialog.d.ts

@@ -0,0 +1,3 @@
+import { type PropsWithChildren } from "react";
+declare const IndexingDialog: ({ children }: PropsWithChildren) => import("react/jsx-runtime").JSX.Element;
+export default IndexingDialog;

package/dist/lib/plugins/search-pagefind/IndexingDialog.js

@@ -0,0 +1,64 @@
+import { Fragment as _Fragment, jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { DialogTrigger } from "@radix-ui/react-dialog";
+import { useCallback, useEffect, useState, } from "react";
+import { Button } from "zudoku/ui/Button.js";
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, } from "zudoku/ui/Dialog.js";
+const ProgressBar = ({ total, current, barLength = 25, emptyChar = "░", filledChar = "█", }) => {
+    const percent = Math.round((current / total) * 100);
+    const filled = Math.round((percent / 100) * barLength);
+    const empty = barLength - filled;
+    return (_jsxs(_Fragment, { children: [filledChar.repeat(filled), emptyChar.repeat(empty), " ", percent, "% (", current, "/", total, ")"] }));
+};
+const IndexingDialog = ({ children }) => {
+    const [indexingState, setIndexingState] = useState({
+        status: "idle",
+    });
+    const startIndexing = useCallback(() => {
+        setIndexingState({ status: "indexing", total: 0, current: 0, path: "" });
+        const eventSource = new EventSource("/__z/pagefind-reindex");
+        eventSource.onmessage = (event) => {
+            const data = JSON.parse(event.data);
+            if (data.type === "progress") {
+                setIndexingState({
+                    status: "indexing",
+                    total: data.total,
+                    current: data.current,
+                    path: data.path,
+                });
+            }
+            else if (data.type === "complete") {
+                eventSource.close();
+                if (data.success) {
+                    setIndexingState({ status: "complete", indexed: data.indexed });
+                }
+                else {
+                    setIndexingState({
+                        status: "error",
+                        message: data.error ?? "Indexing failed",
+                    });
+                }
+            }
+        };
+        eventSource.onerror = () => {
+            eventSource.close();
+            setIndexingState({
+                status: "error",
+                message: "Connection lost during indexing",
+            });
+        };
+        return () => eventSource.close();
+    }, []);
+    useEffect(() => {
+        if (indexingState.status !== "idle")
+            return;
+        return startIndexing();
+    }, [indexingState.status, startIndexing]);
+    const handleDone = () => {
+        if (indexingState.status !== "complete")
+            return;
+        window.location.reload();
+    };
+    return (_jsxs(Dialog, { children: [_jsx(DialogTrigger, { asChild: true, children: children }), _jsxs(DialogContent, { className: "max-w-sm! top-1/3", showCloseButton: false, onInteractOutside: (e) => e.preventDefault(), children: [_jsxs(DialogHeader, { children: [_jsxs(DialogTitle, { children: [indexingState.status === "indexing" && "Building Search Index", indexingState.status === "complete" && "Indexing Complete", indexingState.status === "error" && "Indexing Failed", indexingState.status === "idle" && "Build Search Index"] }), _jsxs(DialogDescription, { children: [indexingState.status === "indexing" && (_jsxs(_Fragment, { children: [indexingState.total > 0 && (_jsx("div", { className: "font-mono text-sm mb-2", children: _jsx(ProgressBar, { ...indexingState }) })), indexingState.path && (_jsx("span", { className: "block text-xs truncate", children: indexingState.path }))] })), indexingState.status === "complete" && (_jsxs(_Fragment, { children: ["Successfully indexed ", indexingState.indexed, " pages."] })), indexingState.status === "error" && (_jsx("span", { className: "text-destructive", children: indexingState.message }))] })] }), _jsx(DialogFooter, { children: _jsxs("div", { className: "flex justify-end gap-2", children: [indexingState.status === "complete" && (_jsx(Button, { size: "sm", onClick: handleDone, children: "Close and reload" })), indexingState.status === "error" && (_jsxs(_Fragment, { children: [_jsx(Button, { variant: "outline", onClick: handleDone, children: "Cancel" }), _jsx(Button, { onClick: startIndexing, children: "Retry" })] }))] }) })] })] }));
+};
+export default IndexingDialog;
+//# sourceMappingURL=IndexingDialog.js.map

package/dist/lib/plugins/search-pagefind/IndexingDialog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IndexingDialog.js","sourceRoot":"","sources":["../../../../src/lib/plugins/search-pagefind/IndexingDialog.tsx"],"names":[],"mappings":"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"}

package/dist/lib/plugins/search-pagefind/PagefindSearch.js

@@ -1,17 +1,19 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
-import { useRef, useState } from "react";
+import { ListPlusIcon } from "lucide-react";
+import { lazy, useEffect, useRef, useState } from "react";
 import { Button } from "zudoku/ui/Button.js";
-import { Callout } from "zudoku/ui/Callout.js";
 import { CommandDialog, CommandEmpty, CommandInput, } from "zudoku/ui/Command.js";
 import { DialogTitle } from "zudoku/ui/Dialog.js";
+import { Kbd, KbdGroup } from "zudoku/ui/Kbd.js";
 import { useAuthState } from "../../authentication/state.js";
 import { useZudoku } from "../../components/context/ZudokuContext.js";
 import { SEARCH_PROTECTED_SECTION } from "../../core/RouteGuard.js";
 import { joinUrl } from "../../util/joinUrl.js";
 import { getResults } from "./get-results.js";
 import { ResultList } from "./ResultList.js";
+const IndexingDialog = lazy(() => import("./IndexingDialog.js"));
 const DEFAULT_RANKING = {
     // Slightly lower than default because API docs tend to have repetitive terms (parameter names, HTTP methods, etc.)
     termFrequency: 0.8,
@@ -55,6 +57,7 @@ const usePagefind = (options) => {
 export const PagefindSearch = ({ isOpen, onClose, options, }) => {
     const { pagefind, error, isError } = usePagefind(options);
     const [searchTerm, setSearchTerm] = useState("");
+    const [selectedValue, setSelectedValue] = useState("");
     const auth = useAuthState();
     const context = useZudoku();
     const inputRef = useRef(null);
@@ -72,9 +75,23 @@ export const PagefindSearch = ({ isOpen, onClose, options, }) => {
         placeholderData: keepPreviousData,
         enabled: !!pagefind && !!searchTerm,
     });
-    return (_jsxs(CommandDialog, { command: { shouldFilter: false }, content: { className: "max-w-[750px]" }, open: isOpen, onOpenChange: onClose, children: [_jsx(VisuallyHidden, { children: _jsx(DialogTitle, { children: "Search" }) }), _jsx(CommandInput, { ref: inputRef, placeholder: "Search...", value: searchTerm, onValueChange: setSearchTerm, disabled: isError }), _jsx(CommandEmpty, { children: searchTerm ? (_jsxs("div", { className: "flex flex-col items-center", children: ["No results found.", _jsx(Button, { variant: "link", onClick: () => {
+    useEffect(() => {
+        if (!searchResults?.length)
+            return;
+        const firstResult = searchResults.at(0);
+        if (!firstResult)
+            return;
+        const firstValue = `${firstResult.meta.title}-${firstResult.url}`;
+        setSelectedValue(firstValue);
+    }, [searchResults]);
+    return (_jsxs(CommandDialog, { command: {
+            shouldFilter: false,
+            loop: true,
+            value: selectedValue,
+            onValueChange: setSelectedValue,
+        }, content: { className: "max-w-[750px]" }, open: isOpen, onOpenChange: onClose, children: [_jsx(VisuallyHidden, { children: _jsx(DialogTitle, { children: "Search" }) }), _jsx(CommandInput, { ref: inputRef, placeholder: "Search...", value: searchTerm, onValueChange: setSearchTerm, disabled: isError }), _jsx(CommandEmpty, { children: searchTerm ? (_jsxs("div", { className: "flex flex-col items-center", children: ["No results found.", _jsx(Button, { variant: "link", onClick: () => {
                                 setSearchTerm("");
                                 inputRef.current?.focus();
-                            }, children: "Clear search" })] })) : ("Start typing to search") }), isError ? (_jsx("div", { className: "p-4 text-sm", children: error.message === "NOT_BUILT_YET" ? (_jsxs(Callout, { type: "info", children: ["Search is currently not available in development mode by default.", _jsx("br", {}), "To still use search in development, run ", _jsx("code", { children: "zudoku build" }), " ", "and copy the ", _jsx("code", { children: "dist/pagefind" }), " directory to your", " ", _jsx("code", { children: "public" }), " directory."] })) : ("An error occurred while loading search.") })) : (_jsx(ResultList, { basePath: context.options.basePath, searchResults: searchResults ?? [], searchTerm: searchTerm, onClose: onClose, maxSubResults: options.maxSubResults }))] }));
+                            }, children: "Clear search" })] })) : ("Start typing to search") }), isError && error.message !== "NOT_BUILT_YET" ? (_jsx("div", { className: "p-4 text-sm", children: "An error occurred while loading search." })) : (_jsxs(_Fragment, { children: [_jsx(ResultList, { basePath: context.options.basePath, searchResults: searchResults ?? [], searchTerm: searchTerm, onClose: onClose, maxSubResults: options.maxSubResults }), _jsxs("div", { className: "flex justify-between p-2 items-center", children: [_jsxs("div", { className: "flex items-center text-xs text-muted-foreground", children: [_jsxs(KbdGroup, { className: "ms-0 me-1", children: [_jsx(Kbd, { children: "\u2191" }), _jsx(Kbd, { children: "\u2193" })] }), "Navigate", _jsx(KbdGroup, { className: "ms-4 me-1", children: _jsx(Kbd, { children: "\u21B5" }) }), "Select", _jsx(KbdGroup, { className: "ms-4 me-1", children: _jsx(Kbd, { children: "Esc" }) }), "Close dialog"] }), import.meta.env.DEV && (_jsx(IndexingDialog, { children: _jsxs(Button, { variant: "outline", className: "h-7 text-xs text-muted-foreground", children: [_jsx(ListPlusIcon, {}), "Build Search Index"] }) }))] })] }))] }));
 };
 //# sourceMappingURL=PagefindSearch.js.map