@umami/shiso 1.14.0 → 1.15.0

package/dist/chunks/App.js

@@ -8151,21 +8151,21 @@ function operationSections(operation) {
 //#endregion
 //#region src/components/OpenApiOperation.tsx
 function FieldChildren({ node }) {
-	return /* @__PURE__ */ jsxs(Fragment$1, { children: [
-		node.description,
-		node.enum && node.enum.length > 0 && /* @__PURE__ */ jsxs("div", {
-			className: "mt-1",
-			children: [
-				"Options:",
-				" ",
-				node.enum.map((value, index) => /* @__PURE__ */ jsxs("span", { children: [index > 0 && ", ", /* @__PURE__ */ jsx("code", { children: value })] }, value))
-			]
-		}),
-		node.children && node.children.length > 0 && /* @__PURE__ */ jsx(Expandable, {
-			title: "properties",
-			children: /* @__PURE__ */ jsx(SchemaTable, { nodes: node.children })
-		})
-	] });
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [node.description, node.enum && node.enum.length > 0 && /* @__PURE__ */ jsxs("div", {
+		className: "mt-1",
+		children: [
+			"Options:",
+			" ",
+			node.enum.map((value, index) => /* @__PURE__ */ jsxs("span", { children: [index > 0 && ", ", /* @__PURE__ */ jsx("code", { children: value })] }, value))
+		]
+	})] });
+}
+function schemaDetails(node) {
+	if (!node.children?.length) return void 0;
+	return /* @__PURE__ */ jsx(Expandable, {
+		title: node.type === "oneOf" || node.type === "anyOf" ? "Allowed types" : "properties",
+		children: /* @__PURE__ */ jsx(SchemaTable, { nodes: node.children })
+	});
 }
 function SchemaTable({ nodes }) {
 	return /* @__PURE__ */ jsx(PropertiesTable, { children: nodes.map((node) => /* @__PURE__ */ jsx(PropertiesTable.Row, {
@@ -8174,12 +8174,14 @@ function SchemaTable({ nodes }) {
 		required: node.required,
 		deprecated: node.deprecated,
 		default: node.default,
+		details: schemaDetails(node),
 		children: /* @__PURE__ */ jsx(FieldChildren, { node })
 	}, node.name || node.type)) });
 }
 /** Renders a schema tree: a root object's properties, or the node itself. */
 function SchemaFields({ node }) {
-	return /* @__PURE__ */ jsx(SchemaTable, { nodes: !node.name && node.children?.length ? node.children : [node] });
+	const isUnion = node.type === "oneOf" || node.type === "anyOf";
+	return /* @__PURE__ */ jsx(SchemaTable, { nodes: !node.name && !isUnion && node.children?.length ? node.children : [node] });
 }
 function HighlightedCode({ language, title, html, source, lineCount }) {
 	return /* @__PURE__ */ jsx(CodeBlock, {
@@ -8219,6 +8221,7 @@ function OpenApiOperation({ operation }) {
 				required: parameter.required,
 				deprecated: parameter.deprecated,
 				default: parameter.default,
+				details: schemaDetails(parameter),
 				children: /* @__PURE__ */ jsx(FieldChildren, { node: parameter })
 			}, parameter.name))] })] }, location)),
 			operation.requestBody && /* @__PURE__ */ jsxs("section", { children: [

package/dist/chunks/docs.js

@@ -12277,9 +12277,10 @@ function PropertiesTable({ children }) {
 	const rows = toElementArray(children);
 	if (!rows.length) return null;
 	return /* @__PURE__ */ jsx("div", {
+		"data-slot": "properties-table",
 		className: "my-4 overflow-x-auto",
 		children: /* @__PURE__ */ jsxs("table", {
-			className: "m-0 min-w-[40rem] table-fixed",
+			className: "m-0 table-fixed [overflow-wrap:anywhere]",
 			children: [/* @__PURE__ */ jsx("thead", { children: /* @__PURE__ */ jsxs("tr", { children: [
 				/* @__PURE__ */ jsx("th", {
 					className: "w-[30%]",
@@ -12294,9 +12295,9 @@ function PropertiesTable({ children }) {
 		})
 	});
 }
-function PropertiesTableRow({ name, type, required, deprecated, default: value, children }) {
+function PropertiesTableRow({ name, type, required, deprecated, default: value, children, details }) {
 	const defaultValue = displayValue(value);
-	return /* @__PURE__ */ jsxs("tr", { children: [
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsxs("tr", { children: [
 		/* @__PURE__ */ jsx("td", { children: /* @__PURE__ */ jsxs("span", {
 			className: "inline-flex flex-wrap items-center gap-2",
 			children: [
@@ -12320,7 +12321,11 @@ function PropertiesTableRow({ name, type, required, deprecated, default: value,
 				children: ["Default: ", defaultValue]
 			}) : null]
 		})
-	] });
+	] }), details && /* @__PURE__ */ jsx("tr", { children: /* @__PURE__ */ jsx("td", {
+		colSpan: 3,
+		className: "[&>[data-slot=collapsible]]:my-0 [&_[data-slot=collapsible-trigger]]:py-1 [&_[data-slot=properties-table]]:my-2",
+		children: details
+	}) })] });
 }
 PropertiesTable.Row = PropertiesTableRow;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umami/shiso",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "description": "Open-source documentation framework for Markdown and MDX sites.",
   "type": "module",
   "bin": {

package/scripts/lib/openapi.mjs

@@ -97,7 +97,7 @@ function typeLabel(spec, schema) {
     return `enum<${baseType(schema)}>`;
   }
   if (schema.oneOf || schema.anyOf) {
-    return 'oneOf';
+    return schema.oneOf ? 'oneOf' : 'anyOf';
   }
   if (schema.type === 'array' || (Array.isArray(schema.type) && schema.type.includes('array'))) {
     const items = schema.items ? deref(spec, schema.items) : undefined;
@@ -159,6 +159,23 @@ export function schemaTree(spec, schema, { name, required, seen = new Set(), dep
         depth: depth + 1,
       }),
     );
+    // Plain scalar alternatives fit in the type cell; keep richer variants
+    // expanded so descriptions, constraints, and nested properties remain visible.
+    if (
+      variants.length <= MAX_CHILDREN &&
+      node.children.every(
+        child =>
+          /^(string|number|integer|boolean|null)$/.test(child.type) &&
+          !child.description &&
+          !child.enum &&
+          child.default === undefined &&
+          !child.deprecated &&
+          !child.children?.length,
+      )
+    ) {
+      node.type = [...new Set(node.children.map(child => child.type))].join(' | ');
+      delete node.children;
+    }
     return node;
   }
 

package/src/components/OpenApiOperation.tsx

@@ -21,15 +21,22 @@ function FieldChildren({ node }: { node: SchemaNode }) {
           ))}
         </div>
       )}
-      {node.children && node.children.length > 0 && (
-        <Expandable title="properties">
-          <SchemaTable nodes={node.children} />
-        </Expandable>
-      )}
     </>
   );
 }
 
+function schemaDetails(node: SchemaNode) {
+  if (!node.children?.length) return undefined;
+
+  return (
+    <Expandable
+      title={node.type === 'oneOf' || node.type === 'anyOf' ? 'Allowed types' : 'properties'}
+    >
+      <SchemaTable nodes={node.children} />
+    </Expandable>
+  );
+}
+
 function SchemaTable({ nodes }: { nodes: SchemaNode[] }) {
   return (
     <PropertiesTable>
@@ -41,6 +48,7 @@ function SchemaTable({ nodes }: { nodes: SchemaNode[] }) {
           required={node.required}
           deprecated={node.deprecated}
           default={node.default}
+          details={schemaDetails(node)}
         >
           <FieldChildren node={node} />
         </PropertiesTable.Row>
@@ -51,7 +59,10 @@ function SchemaTable({ nodes }: { nodes: SchemaNode[] }) {
 
 /** Renders a schema tree: a root object's properties, or the node itself. */
 function SchemaFields({ node }: { node: SchemaNode }) {
-  return <SchemaTable nodes={!node.name && node.children?.length ? node.children : [node]} />;
+  const isUnion = node.type === 'oneOf' || node.type === 'anyOf';
+  return (
+    <SchemaTable nodes={!node.name && !isUnion && node.children?.length ? node.children : [node]} />
+  );
 }
 
 function HighlightedCode({
@@ -115,6 +126,7 @@ export function OpenApiOperation({ operation }: OpenApiOperationProps) {
                 required={parameter.required}
                 deprecated={parameter.deprecated}
                 default={parameter.default}
+                details={schemaDetails(parameter)}
               >
                 <FieldChildren node={parameter} />
               </PropertiesTable.Row>

package/src/components/docs/PropertiesTable.tsx

@@ -10,6 +10,7 @@ export interface PropertiesTableRowProps {
   default?: FieldValue;
   required?: boolean;
   deprecated?: boolean;
+  details?: ReactNode;
   children?: ReactNode;
 }
 
@@ -35,8 +36,8 @@ export function PropertiesTable({ children }: PropertiesTableProps) {
   // Rendered as a plain table so the .docs-markdown table rules in global.css
   // style it exactly like a GFM table; only column widths are set here.
   return (
-    <div className="my-4 overflow-x-auto">
-      <table className="m-0 min-w-[40rem] table-fixed">
+    <div data-slot="properties-table" className="my-4 overflow-x-auto">
+      <table className="m-0 table-fixed [overflow-wrap:anywhere]">
         <thead>
           <tr>
             <th className="w-[30%]">Name</th>
@@ -57,30 +58,43 @@ function PropertiesTableRow({
   deprecated,
   default: value,
   children,
+  details,
 }: PropertiesTableRowProps) {
   const defaultValue = displayValue(value);
 
   return (
-    <tr>
-      <td>
-        <span className="inline-flex flex-wrap items-center gap-2">
-          {name}
-          {required ? (
-            <Badge size="sm" tone="primary">
-              required
-            </Badge>
+    <>
+      <tr>
+        <td>
+          <span className="inline-flex flex-wrap items-center gap-2">
+            {name}
+            {required ? (
+              <Badge size="sm" tone="primary">
+                required
+              </Badge>
+            ) : null}
+            {deprecated ? <Badge size="sm">deprecated</Badge> : null}
+          </span>
+        </td>
+        <td>{displayValue(type)}</td>
+        <td className="[&_p]:m-0">
+          {children}
+          {defaultValue ? (
+            <span className="mt-1 block text-muted-foreground">Default: {defaultValue}</span>
           ) : null}
-          {deprecated ? <Badge size="sm">deprecated</Badge> : null}
-        </span>
-      </td>
-      <td>{displayValue(type)}</td>
-      <td className="[&_p]:m-0">
-        {children}
-        {defaultValue ? (
-          <span className="mt-1 block text-muted-foreground">Default: {defaultValue}</span>
-        ) : null}
-      </td>
-    </tr>
+        </td>
+      </tr>
+      {details && (
+        <tr>
+          <td
+            colSpan={3}
+            className="[&>[data-slot=collapsible]]:my-0 [&_[data-slot=collapsible-trigger]]:py-1 [&_[data-slot=properties-table]]:my-2"
+          >
+            {details}
+          </td>
+        </tr>
+      )}
+    </>
   );
 }
 

package/types/components.d.ts

@@ -162,6 +162,7 @@ export interface PropertiesTableRowProps {
   default?: FieldValue;
   required?: boolean;
   deprecated?: boolean;
+  details?: ReactNode;
   children?: ReactNode;
 }