schema-components 1.18.0 → 1.18.1

package/dist/core/fieldOrder.d.mts

@@ -0,0 +1,10 @@
+import { M as WalkedField } from "../types-D_5ST7SS.mjs";
+
+//#region src/core/fieldOrder.d.ts
+/**
+ * Sort `Object.entries(fields)` by `meta.order`. Lower values come
+ * first; fields without `meta.order` fall back to `Infinity` (last).
+ */
+declare function sortFieldsByOrder(fields: Record<string, WalkedField>): [string, WalkedField][];
+//#endregion
+export { sortFieldsByOrder };

package/dist/core/fieldOrder.mjs

@@ -0,0 +1,12 @@
+//#region src/core/fieldOrder.ts
+/**
+* Sort `Object.entries(fields)` by `meta.order`. Lower values come
+* first; fields without `meta.order` fall back to `Infinity` (last).
+*/
+function sortFieldsByOrder(fields) {
+	return Object.entries(fields).sort((a, b) => {
+		return (typeof a[1].meta.order === "number" ? a[1].meta.order : Infinity) - (typeof b[1].meta.order === "number" ? b[1].meta.order : Infinity);
+	});
+}
+//#endregion
+export { sortFieldsByOrder };

package/dist/core/merge.mjs

@@ -23,27 +23,55 @@ function getObject(obj, key) {
 * Structural equality for arbitrary JSON-like values. Used to decide
 * whether a duplicated keyword across `allOf` branches genuinely
 * conflicts (different values) or is benign (identical values).
+*
+* Cycle-safe: bundling external $refs via `structuredClone` preserves
+* object cycles, so constraint values reaching this comparator can be
+* cyclic. The co-recursive convention applies — when a pair of objects
+* (or arrays) is re-encountered during the same comparison we assume
+* equality holds and return true, letting any genuine inequality
+* elsewhere in the structure surface naturally without recursing
+* forever.
 */
 function deepEqual(a, b) {
+	return deepEqualInner(a, b, /* @__PURE__ */ new WeakMap());
+}
+function deepEqualInner(a, b, seen) {
 	if (a === b) return true;
 	if (typeof a !== typeof b) return false;
 	if (Array.isArray(a)) {
 		if (!Array.isArray(b) || a.length !== b.length) return false;
-		for (let i = 0; i < a.length; i++) if (!deepEqual(a[i], b[i])) return false;
+		if (hasSeenPair(seen, a, b)) return true;
+		recordPair(seen, a, b);
+		for (let i = 0; i < a.length; i++) if (!deepEqualInner(a[i], b[i], seen)) return false;
 		return true;
 	}
 	if (isObject(a) && isObject(b)) {
 		const keysA = Object.keys(a);
 		const keysB = Object.keys(b);
 		if (keysA.length !== keysB.length) return false;
+		if (hasSeenPair(seen, a, b)) return true;
+		recordPair(seen, a, b);
 		for (const key of keysA) {
 			if (!Object.prototype.hasOwnProperty.call(b, key)) return false;
-			if (!deepEqual(a[key], b[key])) return false;
+			if (!deepEqualInner(a[key], b[key], seen)) return false;
 		}
 		return true;
 	}
 	return false;
 }
+function hasSeenPair(seen, a, b) {
+	return seen.get(a)?.has(b) === true;
+}
+function recordPair(seen, a, b) {
+	const existing = seen.get(a);
+	if (existing === void 0) {
+		const partners = /* @__PURE__ */ new WeakSet();
+		partners.add(b);
+		seen.set(a, partners);
+		return;
+	}
+	existing.add(b);
+}
 /**
 * Annotation keywords that can appear as siblings of `$ref` per
 * Draft 2020-12 / OpenAPI 3.1. Structural keywords (type, properties,

package/dist/core/renderer.d.mts

@@ -1,2 +1,2 @@
-import { a as HtmlRenderProps, c as RenderFunction, d as getHtmlRenderFn, f as getRenderFunction, h as typeToKey, i as HtmlRenderFunction, l as RenderProps, m as mergeResolvers, n as BaseFieldProps, o as HtmlResolver, p as mergeHtmlResolvers, r as ComponentResolver, s as RESOLVER_KEYS, t as AllConstraints, u as buildRenderProps } from "../renderer-DXo-rXHJ.mjs";
+import { a as HtmlRenderProps, c as RenderFunction, d as getHtmlRenderFn, f as getRenderFunction, h as typeToKey, i as HtmlRenderFunction, l as RenderProps, m as mergeResolvers, n as BaseFieldProps, o as HtmlResolver, p as mergeHtmlResolvers, r as ComponentResolver, s as RESOLVER_KEYS, t as AllConstraints, u as buildRenderProps } from "../renderer-BAGoX4AK.mjs";
 export { AllConstraints, BaseFieldProps, ComponentResolver, HtmlRenderFunction, HtmlRenderProps, HtmlResolver, RESOLVER_KEYS, RenderFunction, RenderProps, buildRenderProps, getHtmlRenderFn, getRenderFunction, mergeHtmlResolvers, mergeResolvers, typeToKey };

package/dist/core/renderer.mjs

@@ -11,11 +11,6 @@ function noopOnChange() {}
 * a noop `onChange` is wired up, `readOnly` is forced to `true`, and
 * `writeOnly` is forced to `false`. Otherwise the editability is taken
 * from `tree.editability`.
-*
-* The duplicate sibling fields (`enumValues`, `element`, `fields`, etc.)
-* are populated for backwards compatibility with renderers that have not
-* yet migrated to reading from `tree` directly. New renderers should
-* narrow on `tree.type` and read from `tree`.
 */
 function buildRenderProps(tree, value, onChange, renderChild, path) {
 	const isReadOnly = onChange === void 0 || tree.editability === "presentation";
@@ -31,20 +26,6 @@ function buildRenderProps(tree, value, onChange, renderChild, path) {
 		tree,
 		renderChild
 	};
-	if (tree.type === "enum") props.enumValues = tree.enumValues;
-	if (tree.type === "array" && tree.element !== void 0) props.element = tree.element;
-	if (tree.type === "object") props.fields = tree.fields;
-	if (tree.type === "union" || tree.type === "discriminatedUnion") props.options = tree.options;
-	if (tree.type === "discriminatedUnion") props.discriminator = tree.discriminator;
-	if (tree.type === "record") props.keyType = tree.keyType;
-	if (tree.type === "record") props.valueType = tree.valueType;
-	if (tree.type === "tuple") props.prefixItems = tree.prefixItems;
-	if (tree.type === "conditional") props.ifClause = tree.ifClause;
-	if (tree.type === "conditional" && tree.thenClause !== void 0) props.thenClause = tree.thenClause;
-	if (tree.type === "conditional" && tree.elseClause !== void 0) props.elseClause = tree.elseClause;
-	if (tree.type === "negation") props.negated = tree.negated;
-	if (tree.type === "recursive") props.refTarget = tree.refTarget;
-	if (tree.type === "literal") props.literalValues = tree.literalValues;
 	if (tree.examples !== void 0) props.examples = tree.examples;
 	return props;
 }

package/dist/html/a11y.d.mts

@@ -1,5 +1,5 @@
 import { M as WalkedField } from "../types-D_5ST7SS.mjs";
-import { t as AllConstraints } from "../renderer-DXo-rXHJ.mjs";
+import { t as AllConstraints } from "../renderer-BAGoX4AK.mjs";
 import { HtmlAttributes, HtmlNode } from "./html.mjs";
 
 //#region src/html/a11y.d.ts

package/dist/html/renderToHtml.d.mts

@@ -1,5 +1,5 @@
 import { T as SchemaMeta } from "../types-D_5ST7SS.mjs";
-import { o as HtmlResolver } from "../renderer-DXo-rXHJ.mjs";
+import { o as HtmlResolver } from "../renderer-BAGoX4AK.mjs";
 
 //#region src/html/renderToHtml.d.ts
 interface RenderToHtmlOptions {

package/dist/html/renderToHtml.mjs

@@ -1,7 +1,6 @@
 import { normaliseSchema } from "../core/adapter.mjs";
 import { getHtmlRenderFn, mergeHtmlResolvers } from "../core/renderer.mjs";
 import { walk } from "../core/walker.mjs";
-import { h, serialize } from "./html.mjs";
 import { joinPath } from "./a11y.mjs";
 import { defaultHtmlResolver } from "./renderers.mjs";
 //#region src/html/renderToHtml.ts
@@ -59,35 +58,19 @@ function renderFieldHtml(tree, value, resolver, path, renderChild) {
 	const effectiveValue = value ?? tree.defaultValue;
 	const mergedResolver = mergeHtmlResolvers(resolver, defaultHtmlResolver);
 	const renderFn = getHtmlRenderFn(tree.type, mergedResolver);
-	if (renderFn !== void 0) {
-		const props = {
-			value: effectiveValue,
-			readOnly: tree.editability === "presentation",
-			writeOnly: tree.editability === "input",
-			meta: tree.meta,
-			constraints: tree.constraints,
-			path,
-			tree,
-			renderChild
-		};
-		if (tree.type === "enum") props.enumValues = tree.enumValues;
-		if (tree.type === "array" && tree.element !== void 0) props.element = tree.element;
-		if (tree.type === "object") props.fields = tree.fields;
-		if (tree.type === "union" || tree.type === "discriminatedUnion") props.options = tree.options;
-		if (tree.type === "discriminatedUnion") props.discriminator = tree.discriminator;
-		if (tree.type === "record") props.keyType = tree.keyType;
-		if (tree.type === "record") props.valueType = tree.valueType;
-		if (tree.type === "tuple") props.prefixItems = tree.prefixItems;
-		if (tree.type === "conditional") props.ifClause = tree.ifClause;
-		if (tree.type === "conditional" && tree.thenClause !== void 0) props.thenClause = tree.thenClause;
-		if (tree.type === "conditional" && tree.elseClause !== void 0) props.elseClause = tree.elseClause;
-		if (tree.type === "negation") props.negated = tree.negated;
-		if (tree.type === "literal") props.literalValues = tree.literalValues;
-		if (tree.examples !== void 0) props.examples = tree.examples;
-		return renderFn(props);
-	}
-	if (effectiveValue === void 0 || effectiveValue === null) return serialize(h("span", { class: "sc-value sc-value--empty" }, "—"));
-	return serialize(h("span", { class: "sc-value" }, typeof effectiveValue === "string" ? effectiveValue : JSON.stringify(effectiveValue)));
+	if (renderFn === void 0) throw new Error(`renderToHtml: no HTML renderer registered for type "${tree.type}"`);
+	const props = {
+		value: effectiveValue,
+		readOnly: tree.editability === "presentation",
+		writeOnly: tree.editability === "input",
+		meta: tree.meta,
+		constraints: tree.constraints,
+		path,
+		tree,
+		renderChild
+	};
+	if (tree.examples !== void 0) props.examples = tree.examples;
+	return renderFn(props);
 }
 //#endregion
 export { renderToHtml };

package/dist/html/renderToHtmlStream.d.mts

@@ -1,5 +1,5 @@
 import { T as SchemaMeta } from "../types-D_5ST7SS.mjs";
-import { o as HtmlResolver } from "../renderer-DXo-rXHJ.mjs";
+import { o as HtmlResolver } from "../renderer-BAGoX4AK.mjs";
 
 //#region src/html/renderToHtmlStream.d.ts
 interface StreamRenderOptions {

package/dist/html/renderers.d.mts

@@ -1,5 +1,5 @@
 import { M as WalkedField } from "../types-D_5ST7SS.mjs";
-import { o as HtmlResolver } from "../renderer-DXo-rXHJ.mjs";
+import { o as HtmlResolver } from "../renderer-BAGoX4AK.mjs";
 
 //#region src/html/renderers.d.ts
 declare function dateInputType(format: string | undefined): string | undefined;

package/dist/html/renderers.mjs

@@ -1,3 +1,4 @@
+import { sortFieldsByOrder } from "../core/fieldOrder.mjs";
 import { h, raw, serialize } from "./html.mjs";
 import { ariaDescribedByAttrs, ariaLabelAttrs, ariaReadonlyAttrs, ariaRequiredAttrs, buildHintElement, buildInputId, requiredIndicator } from "./a11y.mjs";
 //#region src/html/renderers.ts
@@ -135,7 +136,8 @@ function renderEnumEditable(props) {
 	const enumValue = typeof props.value === "string" ? props.value : "";
 	const id = fieldId(props.path);
 	const selectedValue = props.writeOnly ? "" : enumValue;
-	const optionNodes = [h("option", { value: "" }, "Select…"), ...(props.enumValues ?? []).map((v) => {
+	const enumValues = props.tree.type === "enum" ? props.tree.enumValues : [];
+	const optionNodes = [h("option", { value: "" }, "Select…"), ...enumValues.map((v) => {
 		const display = v === null ? "null" : typeof v === "string" ? v : String(v);
 		const attrs = { value: display };
 		if (display === selectedValue) attrs.selected = true;
@@ -153,15 +155,13 @@ function renderObjectHtml(props) {
 	return serialize(renderObjectNode(props));
 }
 function renderObjectNode(props) {
-	const fields = props.fields;
-	if (fields === void 0) return "";
+	if (props.tree.type !== "object") return "";
+	const fields = props.tree.fields;
 	const isRecord = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 	const obj = isRecord(props.value) ? props.value : {};
 	const descriptionText = typeof props.meta.description === "string" ? props.meta.description : void 0;
 	const legend = descriptionText !== void 0 ? h("legend", {}, descriptionText) : void 0;
-	const sortedEntries = Object.entries(fields).sort((a, b) => {
-		return (typeof a[1].meta.order === "number" ? a[1].meta.order : Infinity) - (typeof b[1].meta.order === "number" ? b[1].meta.order : Infinity);
-	}).filter(([, field]) => field.meta.visible !== false);
+	const sortedEntries = sortFieldsByOrder(fields).filter(([, field]) => field.meta.visible !== false);
 	if (props.readOnly) {
 		const children = [];
 		if (legend !== void 0) children.push(legend);
@@ -203,7 +203,7 @@ function renderArrayHtml(props) {
 }
 function renderArrayNode(props) {
 	const arr = Array.isArray(props.value) ? props.value : [];
-	const element = props.element;
+	const element = props.tree.type === "array" ? props.tree.element : void 0;
 	if (element === void 0) return "";
 	const childHtmls = arr.map((item, i) => props.renderChild(element, item, `[${String(i)}]`));
 	if (props.readOnly) return h("ul", { class: "sc-array" }, ...childHtmls.map((childHtml) => h("li", { class: "sc-item" }, raw(childHtml))));
@@ -213,10 +213,10 @@ function renderRecordHtml(props) {
 	return serialize(renderRecordNode(props));
 }
 function renderRecordNode(props) {
+	if (props.tree.type !== "record") return "";
 	const isRecord = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 	const obj = isRecord(props.value) ? props.value : {};
-	const valueType = props.valueType;
-	if (valueType === void 0) return "";
+	const valueType = props.tree.valueType;
 	const attrs = {
 		class: "sc-record",
 		role: "group"
@@ -238,12 +238,13 @@ function renderRecordNode(props) {
 	return h("div", attrs, ...children);
 }
 function renderLiteralHtml(props) {
-	const values = props.literalValues;
-	if (values === void 0 || values.length === 0) return serialize(h("span", { class: "sc-value sc-value--empty" }, "—"));
+	if (props.tree.type !== "literal") return serialize(h("span", { class: "sc-value sc-value--empty" }, "—"));
+	const values = props.tree.literalValues;
+	if (values.length === 0) return serialize(h("span", { class: "sc-value sc-value--empty" }, "—"));
 	return serialize(h("span", { class: "sc-value" }, values.map((v) => v === null ? "null" : String(v)).join(", ")));
 }
 function renderUnionHtml(props) {
-	const options = props.options;
+	const options = props.tree.type === "union" || props.tree.type === "discriminatedUnion" ? props.tree.options : void 0;
 	if (options === void 0 || options.length === 0) {
 		if (props.value === void 0 || props.value === null) return serialize(h("span", { class: "sc-value sc-value--empty" }, "—"));
 		return serialize(h("span", { class: "sc-value" }, JSON.stringify(props.value)));
@@ -255,8 +256,8 @@ function renderUnionHtml(props) {
 	return serialize(h("span", { class: "sc-value sc-value--empty" }, "—"));
 }
 function renderDiscriminatedUnionHtml(props) {
-	const options = props.options;
-	const discriminator = props.discriminator;
+	const options = props.tree.type === "discriminatedUnion" ? props.tree.options : void 0;
+	const discriminator = props.tree.type === "discriminatedUnion" ? props.tree.discriminator : void 0;
 	if (options === void 0 || options.length === 0) {
 		if (props.value === void 0 || props.value === null) return serialize(h("span", { class: "sc-value sc-value--empty" }, "—"));
 		return serialize(h("span", { class: "sc-value" }, JSON.stringify(props.value)));
@@ -285,7 +286,9 @@ function renderDiscriminatedUnionHtml(props) {
 		if (activeOption !== void 0) return props.renderChild(activeOption, props.value);
 		return serialize(h("span", { class: "sc-value sc-value--empty" }, "—"));
 	}
-	const panelId = `sc-${props.path}-panel`;
+	const baseId = fieldId(props.path);
+	const panelId = `${baseId}-panel`;
+	const tabId = (i) => `${baseId}-tab-${String(i)}`;
 	const children = [h("div", {
 		role: "tablist",
 		class: "sc-tabs",
@@ -295,7 +298,7 @@ function renderDiscriminatedUnionHtml(props) {
 			type: "button",
 			role: "tab",
 			class: i === activeIndex ? "sc-tab sc-tab--active" : "sc-tab",
-			id: `sc-${props.path}-tab-${String(i)}`,
+			id: tabId(i),
 			"aria-selected": i === activeIndex ? "true" : void 0,
 			"aria-controls": panelId,
 			tabindex: i === activeIndex ? "0" : "-1"
@@ -306,7 +309,7 @@ function renderDiscriminatedUnionHtml(props) {
 		children.push(h("div", {
 			role: "tabpanel",
 			id: panelId,
-			"aria-labelledby": `sc-${props.path}-tab-${String(activeIndex)}`
+			"aria-labelledby": tabId(activeIndex)
 		}, raw(childHtml)));
 	}
 	return serialize(h("div", { class: "sc-discriminated-union" }, ...children));
@@ -331,7 +334,7 @@ function renderFileHtml(props) {
 	return serialize(h("input", attrs));
 }
 function renderRecursiveHtml(props) {
-	const refTarget = props.refTarget ?? "";
+	const refTarget = props.tree.type === "recursive" ? props.tree.refTarget : "";
 	return serialize(h("fieldset", { class: "sc-recursive" }, `↻ ${typeof props.meta.description === "string" ? props.meta.description : refTarget} (recursive)`));
 }
 function renderUnknownHtml(props) {
@@ -350,9 +353,9 @@ function renderUnknownHtml(props) {
 	return serialize(h("input", attrs));
 }
 function renderTupleHtml(props) {
+	if (props.tree.type !== "tuple") return renderUnknownHtml(props);
 	const arr = Array.isArray(props.value) ? props.value : [];
-	const prefixItems = props.prefixItems;
-	if (prefixItems === void 0) return renderUnknownHtml(props);
+	const prefixItems = props.tree.prefixItems;
 	const children = [];
 	for (let i = 0; i < prefixItems.length; i++) {
 		const itemValue = arr[i];
@@ -365,9 +368,11 @@ function renderTupleHtml(props) {
 }
 function renderConditionalHtml(props) {
 	const children = [];
-	if (props.ifClause !== void 0) children.push(h("div", { class: "sc-conditional-if" }, raw("if: ...")));
-	if (props.thenClause !== void 0) children.push(h("div", { class: "sc-conditional-then" }, raw("then: ...")));
-	if (props.elseClause !== void 0) children.push(h("div", { class: "sc-conditional-else" }, raw("else: ...")));
+	if (props.tree.type === "conditional") {
+		children.push(h("div", { class: "sc-conditional-if" }, raw("if: ...")));
+		if (props.tree.thenClause !== void 0) children.push(h("div", { class: "sc-conditional-then" }, raw("then: ...")));
+		if (props.tree.elseClause !== void 0) children.push(h("div", { class: "sc-conditional-else" }, raw("else: ...")));
+	}
 	return serialize(h("div", { class: "sc-conditional" }, ...children));
 }
 function renderNegationHtml(props) {

package/dist/html/streamRenderers.d.mts

@@ -1,5 +1,5 @@
 import { M as WalkedField } from "../types-D_5ST7SS.mjs";
-import { o as HtmlResolver } from "../renderer-DXo-rXHJ.mjs";
+import { o as HtmlResolver } from "../renderer-BAGoX4AK.mjs";
 import { HtmlElement } from "./html.mjs";
 
 //#region src/html/streamRenderers.d.ts

package/dist/html/streamRenderers.mjs

@@ -14,27 +14,16 @@ function yieldClose(el) {
 }
 function renderLeaf(tree, value, mergedResolver, path) {
 	const renderFn = getHtmlRenderFn(tree.type, mergedResolver);
-	if (renderFn !== void 0) {
-		const props = {
-			value,
-			readOnly: tree.editability === "presentation",
-			writeOnly: tree.editability === "input",
-			meta: tree.meta,
-			constraints: tree.constraints,
-			path,
-			tree,
-			renderChild: () => ""
-		};
-		if (tree.type === "enum") props.enumValues = tree.enumValues;
-		if (tree.type === "literal") props.literalValues = tree.literalValues;
-		if (tree.type === "array" && tree.element !== void 0) props.element = tree.element;
-		if (tree.type === "object") props.fields = tree.fields;
-		if (tree.type === "union") props.options = tree.options;
-		if (tree.type === "discriminatedUnion") props.discriminator = tree.discriminator;
-		if (tree.type === "record") props.keyType = tree.keyType;
-		if (tree.type === "record") props.valueType = tree.valueType;
-		return renderFn(props);
-	}
+	if (renderFn !== void 0) return renderFn({
+		value,
+		readOnly: tree.editability === "presentation",
+		writeOnly: tree.editability === "input",
+		meta: tree.meta,
+		constraints: tree.constraints,
+		path,
+		tree,
+		renderChild: () => ""
+	});
 	if (value === void 0 || value === null) return serialize(h("span", { class: "sc-value sc-value--empty" }, "—"));
 	return serialize(h("span", { class: "sc-value" }, typeof value === "string" ? value : JSON.stringify(value)));
 }

package/dist/openapi/ApiSecurity.mjs

@@ -13,7 +13,7 @@ function ApiSecurity({ requirements, schemes }) {
 						"data-security-name": true,
 						children: req.name
 					}),
-					scheme !== void 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+					scheme !== void 0 && /* @__PURE__ */ jsxs(Fragment, { children: [scheme.type !== void 0 && /* @__PURE__ */ jsx("span", {
 						"data-security-type": true,
 						children: scheme.type
 					}), scheme.description && /* @__PURE__ */ jsx("span", {

package/dist/openapi/bundle.mjs

@@ -88,6 +88,7 @@ async function walkAndInline(node, schemasNode, uriCache, inlineCache, resolver)
 			}
 			if (inlinedName !== void 0) node.$ref = `#/components/schemas/${inlinedName}`;
 		}
+		return;
 	}
 	for (const value of Object.values(node)) if (isObject(value)) await walkAndInline(value, schemasNode, uriCache, inlineCache, resolver);
 	else if (Array.isArray(value)) for (const item of value) await walkAndInline(item, schemasNode, uriCache, inlineCache, resolver);

package/dist/openapi/components.mjs

@@ -1,14 +1,14 @@
 import { isObject, toRecordOrUndefined } from "../core/guards.mjs";
 import { walk } from "../core/walker.mjs";
-import { joinPath, renderField, sanitisePrefix } from "../react/SchemaComponent.mjs";
 import { ApiCallbacks } from "./ApiCallbacks.mjs";
 import { ApiLinks } from "./ApiLinks.mjs";
 import { ApiResponseHeaders } from "./ApiResponseHeaders.mjs";
 import { ApiSecurity } from "./ApiSecurity.mjs";
 import { getLinks, getSecurityRequirements, getSecuritySchemes, listCallbacks } from "./parser.mjs";
+import { joinPath, renderField, sanitisePrefix } from "../react/SchemaComponent.mjs";
 import { getParsed, resolveOperation, resolveParameters, resolveRequestBody, resolveResponse, toDoc } from "./resolve.mjs";
-import { useId } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { useId } from "react";
 //#region src/openapi/components.tsx
 /**
 * OpenAPI React components with type-safe generics.

package/dist/openapi/parser.d.mts

@@ -41,7 +41,7 @@ interface SecurityRequirement {
   scopes: string[];
 }
 interface SecurityScheme {
-  type: string;
+  type: string | undefined;
   description: string | undefined;
   name: string | undefined;
   location: string | undefined;
@@ -92,7 +92,7 @@ declare function getRequestBody(parsed: OpenApiDocument, path: string, method: s
 declare function getResponses(parsed: OpenApiDocument, path: string, method: string): ResponseInfo[];
 declare function getSecurityRequirements(parsed: OpenApiDocument, path: string, method: string): SecurityRequirement[];
 declare function getSecuritySchemes(parsed: OpenApiDocument): Map<string, SecurityScheme>;
-declare function getResponseHeaders(response: JsonObject): Map<string, HeaderInfo>;
+declare function getResponseHeaders(response: JsonObject, doc?: JsonObject): Map<string, HeaderInfo>;
 declare function listWebhooks(parsed: OpenApiDocument): WebhookInfo[];
 declare function getExternalDocs(obj: JsonObject): ExternalDocs | undefined;
 declare function getXmlInfo(schema: JsonObject): XmlInfo | undefined;

package/dist/openapi/parser.mjs

@@ -143,7 +143,7 @@ function getResponses(parsed, path, method) {
 		const content = getProperty(response, "content");
 		const contentTypes = isObject(content) ? Object.keys(content) : [];
 		const schema = isObject(content) ? extractSchemaFromContent(content) : void 0;
-		const headers = getResponseHeaders(response);
+		const headers = getResponseHeaders(response, parsed.doc);
 		result.push({
 			statusCode,
 			description: getString(response, "description"),
@@ -196,7 +196,7 @@ function getSecuritySchemes(parsed) {
 		if (!isObject(scheme)) continue;
 		const flowsProp = getProperty(scheme, "flows");
 		result.set(name, {
-			type: getString(scheme, "type") ?? "",
+			type: getString(scheme, "type"),
 			description: getString(scheme, "description"),
 			name: getString(scheme, "name"),
 			location: getString(scheme, "in"),
@@ -208,14 +208,14 @@ function getSecuritySchemes(parsed) {
 	}
 	return result;
 }
-function getResponseHeaders(response) {
+function getResponseHeaders(response, doc) {
 	const result = /* @__PURE__ */ new Map();
 	const headers = getProperty(response, "headers");
 	if (!isObject(headers)) return result;
 	for (const [name, headerObj] of Object.entries(headers)) {
 		if (!isObject(headerObj)) continue;
 		const ref = getString(headerObj, "$ref");
-		const header = (ref !== void 0 ? resolveRefInDoc(headerObj, ref) : void 0) ?? headerObj;
+		const header = (ref !== void 0 && doc !== void 0 ? resolveRefInDoc(doc, ref) : void 0) ?? headerObj;
 		const schemaProp = getProperty(header, "schema");
 		result.set(name, {
 			name,

package/dist/react/SchemaComponent.d.mts

@@ -1,11 +1,11 @@
 import { M as WalkedField, T as SchemaMeta, d as FieldOverrides, u as FieldOverride } from "../types-D_5ST7SS.mjs";
 import { t as Diagnostic } from "../diagnostics-BYk63jsC.mjs";
 import { t as SchemaError } from "../errors-C5zRC2PU.mjs";
-import { l as RenderProps, r as ComponentResolver } from "../renderer-DXo-rXHJ.mjs";
+import { l as RenderProps, r as ComponentResolver } from "../renderer-BAGoX4AK.mjs";
 import { c as PathOfType, l as ResolveOpenAPIRef, n as FromJSONSchema } from "../typeInference-5JiqIZ8t.mjs";
 import { z } from "zod";
-import { ReactNode } from "react";
 import * as _$react_jsx_runtime0 from "react/jsx-runtime";
+import { ReactNode } from "react";
 
 //#region src/react/SchemaComponent.d.ts
 /**

package/dist/react/SchemaComponent.mjs

@@ -7,8 +7,8 @@ import { walk } from "../core/walker.mjs";
 import { headlessResolver } from "./headless.mjs";
 import { resolvePath, resolveValue, setNestedValue } from "./fieldPath.mjs";
 import { z } from "zod";
-import { createContext, isValidElement, useCallback, useContext, useId, useMemo } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
+import { createContext, isValidElement, useCallback, useContext, useId, useMemo } from "react";
 //#region src/react/SchemaComponent.tsx
 /**
 * <SchemaComponent> — renders UI from Zod, JSON Schema, or OpenAPI schemas.

package/dist/react/SchemaView.d.mts

@@ -1,6 +1,6 @@
 import { T as SchemaMeta } from "../types-D_5ST7SS.mjs";
 import { t as Diagnostic } from "../diagnostics-BYk63jsC.mjs";
-import { r as ComponentResolver } from "../renderer-DXo-rXHJ.mjs";
+import { r as ComponentResolver } from "../renderer-BAGoX4AK.mjs";
 import { WidgetMap } from "./SchemaComponent.mjs";
 import { ReactNode } from "react";
 

package/dist/react/SchemaView.mjs

@@ -4,8 +4,8 @@ import { buildRenderProps, getRenderFunction, mergeResolvers } from "../core/ren
 import { walk } from "../core/walker.mjs";
 import { headlessResolver } from "./headless.mjs";
 import { joinPath, sanitisePrefix } from "./SchemaComponent.mjs";
-import { createElement, isValidElement, useId } from "react";
 import { jsx } from "react/jsx-runtime";
+import { createElement, isValidElement, useId } from "react";
 //#region src/react/SchemaView.tsx
 /**
 * React Server Component for read-only schema rendering.

package/dist/react/headless.d.mts

@@ -1,4 +1,4 @@
-import { r as ComponentResolver } from "../renderer-DXo-rXHJ.mjs";
+import { r as ComponentResolver } from "../renderer-BAGoX4AK.mjs";
 
 //#region src/react/headless.d.ts
 /**

package/dist/react/headlessRenderers.d.mts

@@ -1,5 +1,5 @@
 import { M as WalkedField } from "../types-D_5ST7SS.mjs";
-import { l as RenderProps } from "../renderer-DXo-rXHJ.mjs";
+import { l as RenderProps } from "../renderer-BAGoX4AK.mjs";
 import { ReactNode } from "react";
 
 //#region src/react/headlessRenderers.d.ts

package/dist/react/headlessRenderers.mjs

@@ -1,6 +1,7 @@
 import { isObject } from "../core/guards.mjs";
-import { isValidElement, useCallback, useEffect, useRef } from "react";
+import { sortFieldsByOrder } from "../core/fieldOrder.mjs";
 import { jsx, jsxs } from "react/jsx-runtime";
+import { isValidElement, useCallback, useEffect, useRef } from "react";
 //#region src/react/headlessRenderers.tsx
 /**
 * Headless renderer functions — one per schema type.
@@ -128,24 +129,27 @@ function renderString(props) {
 		},
 		...ariaAttrs
 	});
-	if (props.enumValues !== void 0 && props.enumValues.length > 0) return /* @__PURE__ */ jsxs("select", {
-		id,
-		value: strValue,
-		onChange: (e) => {
-			props.onChange(e.target.value);
-		},
-		...ariaAttrs,
-		children: [/* @__PURE__ */ jsxs("option", {
-			value: "",
-			children: ["Select", "…"]
-		}), props.enumValues.map((v) => {
-			const display = v === null ? "null" : typeof v === "string" ? v : String(v);
-			return /* @__PURE__ */ jsx("option", {
-				value: display,
-				children: display
-			}, display);
-		})]
-	});
+	if (props.tree.type === "enum" && props.tree.enumValues.length > 0) {
+		const enumValues = props.tree.enumValues;
+		return /* @__PURE__ */ jsxs("select", {
+			id,
+			value: strValue,
+			onChange: (e) => {
+				props.onChange(e.target.value);
+			},
+			...ariaAttrs,
+			children: [/* @__PURE__ */ jsxs("option", {
+				value: "",
+				children: ["Select", "…"]
+			}), enumValues.map((v) => {
+				const display = v === null ? "null" : typeof v === "string" ? v : String(v);
+				return /* @__PURE__ */ jsx("option", {
+					value: display,
+					children: display
+				}, display);
+			})]
+		});
+	}
 	return /* @__PURE__ */ jsx("input", {
 		id,
 		type: props.constraints.format === "email" ? "email" : props.constraints.format === "uri" ? "url" : "text",
@@ -225,6 +229,7 @@ function renderEnum(props) {
 	});
 	const ariaAttrs = {};
 	if (props.tree.isOptional === false) ariaAttrs["aria-required"] = "true";
+	const enumValues = props.tree.type === "enum" ? props.tree.enumValues : [];
 	return /* @__PURE__ */ jsxs("select", {
 		id,
 		value: props.writeOnly ? "" : enumValue,
@@ -235,7 +240,7 @@ function renderEnum(props) {
 		children: [/* @__PURE__ */ jsxs("option", {
 			value: "",
 			children: ["Select", "…"]
-		}), props.enumValues?.map((v) => {
+		}), enumValues.map((v) => {
 			const display = v === null ? "null" : typeof v === "string" ? v : String(v);
 			return /* @__PURE__ */ jsx("option", {
 				value: display,
@@ -245,12 +250,10 @@ function renderEnum(props) {
 	});
 }
 function renderObject(props) {
+	if (props.tree.type !== "object") return null;
 	const obj = isObject(props.value) ? props.value : {};
-	const fields = props.fields;
-	if (fields === void 0) return null;
-	const sortedEntries = Object.entries(fields).sort((a, b) => {
-		return (typeof a[1].meta.order === "number" ? a[1].meta.order : Infinity) - (typeof b[1].meta.order === "number" ? b[1].meta.order : Infinity);
-	});
+	const fields = props.tree.fields;
+	const sortedEntries = sortFieldsByOrder(fields);
 	return /* @__PURE__ */ jsxs("fieldset", { children: [typeof props.meta.description === "string" && /* @__PURE__ */ jsx("legend", { children: props.meta.description }), sortedEntries.filter(([, field]) => field.meta.visible !== false).map(([key, field]) => {
 		const childValue = obj[key];
 		const childId = inputId(`${props.path}.${key}`);
@@ -312,9 +315,9 @@ function renameRecordKey(obj, oldKey, newKey) {
 	return renamed;
 }
 function renderRecord(props) {
+	if (props.tree.type !== "record") return null;
 	const obj = isObject(props.value) ? props.value : {};
-	const valueType = props.valueType;
-	if (valueType === void 0) return null;
+	const valueType = props.tree.valueType;
 	const entries = Object.entries(obj);
 	if (props.readOnly) {
 		if (entries.length === 0) return /* @__PURE__ */ jsx("span", {
@@ -392,8 +395,9 @@ function renderRecord(props) {
 	});
 }
 function renderArray(props) {
+	if (props.tree.type !== "array") return null;
 	const arr = Array.isArray(props.value) ? props.value : [];
-	const element = props.element;
+	const element = props.tree.element;
 	if (element === void 0) return null;
 	if (arr.length === 0) return null;
 	return /* @__PURE__ */ jsx("div", {
@@ -410,7 +414,7 @@ function renderArray(props) {
 	});
 }
 function renderUnion(props) {
-	const options = props.options;
+	const options = props.tree.type === "union" || props.tree.type === "discriminatedUnion" ? props.tree.options : void 0;
 	if (options === void 0 || options.length === 0) {
 		if (props.value === void 0 || props.value === null) return /* @__PURE__ */ jsx("span", { children: "—" });
 		return /* @__PURE__ */ jsx("span", { children: JSON.stringify(props.value) });
@@ -422,8 +426,8 @@ function renderUnion(props) {
 	return /* @__PURE__ */ jsx("span", { children: "—" });
 }
 function renderDiscriminatedUnion(props) {
-	const options = props.options;
-	const discriminator = props.discriminator;
+	const options = props.tree.type === "discriminatedUnion" ? props.tree.options : void 0;
+	const discriminator = props.tree.type === "discriminatedUnion" ? props.tree.discriminator : void 0;
 	if (options === void 0 || options.length === 0) {
 		if (props.value === void 0 || props.value === null) return /* @__PURE__ */ jsx("span", { children: "—" });
 		return /* @__PURE__ */ jsx("span", { children: JSON.stringify(props.value) });
@@ -584,7 +588,7 @@ function renderFile(props) {
 	});
 }
 function renderRecursive(props) {
-	const refTarget = props.refTarget ?? "";
+	const refTarget = props.tree.type === "recursive" ? props.tree.refTarget : "";
 	return /* @__PURE__ */ jsx("fieldset", { children: /* @__PURE__ */ jsxs("em", { children: [
 		"↻ ",
 		typeof props.meta.description === "string" ? props.meta.description : refTarget,

package/dist/{renderer-DXo-rXHJ.d.mts → renderer-BAGoX4AK.d.mts}

@@ -13,6 +13,13 @@ type AllConstraints = StringConstraints & NumberConstraints & ArrayConstraints &
 /**
  * Properties available on every schema field, regardless of rendering target.
  * Both React and HTML renderers receive these.
+ *
+ * Per-type schema data — enum values, object fields, array element schema,
+ * union options, record key/value types, tuple `prefixItems`, conditional
+ * if/then/else clauses, negation `negated`, recursive `refTarget`, literal
+ * values — lives on the discriminated `tree`. Renderers narrow on
+ * `tree.type` and read from the matching variant; there are no duplicate
+ * sibling fields on these props.
  */
 interface BaseFieldProps {
   /** Current field value. */
@@ -27,31 +34,6 @@ interface BaseFieldProps {
   constraints: AllConstraints;
   /** Dot-separated path from root (e.g. "address.city"). */
   path: string;
-  /** For enums: the allowed values. */
-  enumValues?: (string | number | boolean | null)[];
-  /** For arrays: the element schema. */
-  element?: WalkedField;
-  /** For tuples: positional element schemas from prefixItems. */
-  prefixItems?: WalkedField[];
-  /** For conditionals: the if/then/else sub-schemas. */
-  ifClause?: WalkedField;
-  thenClause?: WalkedField;
-  elseClause?: WalkedField;
-  /** For negations: the negated sub-schema. */
-  negated?: WalkedField;
-  /** For recursive fields: the $ref string that would create the cycle. */
-  refTarget?: string;
-  /** For objects: map of field name → WalkedField. */
-  fields?: Record<string, WalkedField>;
-  /** For unions: the option schemas. */
-  options?: WalkedField[];
-  /** For discriminated unions: the discriminator key. */
-  discriminator?: string;
-  /** For records: key and value schemas. */
-  keyType?: WalkedField;
-  valueType?: WalkedField;
-  /** For literals: the literal value(s). */
-  literalValues?: (string | number | boolean | null)[];
   /** Example values from the schema's `examples` keyword. */
   examples?: unknown[];
   /** Walked field tree for recursive rendering. */
@@ -109,11 +91,6 @@ interface HtmlRenderProps extends BaseFieldProps {
  * a noop `onChange` is wired up, `readOnly` is forced to `true`, and
  * `writeOnly` is forced to `false`. Otherwise the editability is taken
  * from `tree.editability`.
- *
- * The duplicate sibling fields (`enumValues`, `element`, `fields`, etc.)
- * are populated for backwards compatibility with renderers that have not
- * yet migrated to reading from `tree` directly. New renderers should
- * narrow on `tree.type` and read from `tree`.
  */
 declare function buildRenderProps(tree: WalkedField, value: unknown, onChange: ((next: unknown) => void) | undefined, renderChild: RenderProps["renderChild"], path: string): RenderProps;
 type RenderFunction = (props: RenderProps) => unknown;

package/dist/themes/mantine.d.mts

@@ -1,4 +1,4 @@
-import { r as ComponentResolver } from "../renderer-DXo-rXHJ.mjs";
+import { r as ComponentResolver } from "../renderer-BAGoX4AK.mjs";
 
 //#region src/themes/mantine.d.ts
 /**

package/dist/themes/mantine.mjs

@@ -1,4 +1,5 @@
 import { isObject } from "../core/guards.mjs";
+import { sortFieldsByOrder } from "../core/fieldOrder.mjs";
 import { inputId, toReactNode } from "../react/headlessRenderers.mjs";
 import { headlessResolver } from "../react/headless.mjs";
 import { jsx } from "react/jsx-runtime";
@@ -123,7 +124,7 @@ function renderObjectContainer(props) {
 	const obj = isObject(props.value) ? props.value : {};
 	return /* @__PURE__ */ jsx(MantineFieldset, {
 		legend: getLabel(props),
-		children: Object.entries(fields).filter(([, field]) => field.meta.visible !== false).map(([key, field]) => {
+		children: sortFieldsByOrder(fields).filter(([, field]) => field.meta.visible !== false).map(([key, field]) => {
 			const childValue = obj[key];
 			const childOnChange = (v) => {
 				const updated = {};

package/dist/themes/mui.d.mts

@@ -1,4 +1,4 @@
-import { r as ComponentResolver } from "../renderer-DXo-rXHJ.mjs";
+import { r as ComponentResolver } from "../renderer-BAGoX4AK.mjs";
 
 //#region src/themes/mui.d.ts
 /**

package/dist/themes/mui.mjs

@@ -1,8 +1,9 @@
 import { isObject } from "../core/guards.mjs";
+import { sortFieldsByOrder } from "../core/fieldOrder.mjs";
 import { inputId, toReactNode } from "../react/headlessRenderers.mjs";
 import { headlessResolver } from "../react/headless.mjs";
-import { isValidElement } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
+import { isValidElement } from "react";
 //#region src/themes/mui.tsx
 function ariaRequired(tree) {
 	return { required: tree.isOptional === false };
@@ -136,7 +137,7 @@ function renderObjectContainer(props) {
 		children: [typeof props.meta.description === "string" && /* @__PURE__ */ jsx(MuiTypography, {
 			variant: "h6",
 			children: props.meta.description
-		}), Object.entries(fields).map(([key, field]) => {
+		}), sortFieldsByOrder(fields).map(([key, field]) => {
 			const childValue = obj[key];
 			const childOnChange = (v) => {
 				const updated = {};

package/dist/themes/radix.d.mts

@@ -1,4 +1,4 @@
-import { r as ComponentResolver } from "../renderer-DXo-rXHJ.mjs";
+import { r as ComponentResolver } from "../renderer-BAGoX4AK.mjs";
 
 //#region src/themes/radix.d.ts
 /**

package/dist/themes/radix.mjs

@@ -1,4 +1,5 @@
 import { isObject } from "../core/guards.mjs";
+import { sortFieldsByOrder } from "../core/fieldOrder.mjs";
 import { inputId, toReactNode } from "../react/headlessRenderers.mjs";
 import { headlessResolver } from "../react/headless.mjs";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -161,7 +162,7 @@ function renderObjectContainer(props) {
 	}), /* @__PURE__ */ jsx(RadixFlex, {
 		direction: "column",
 		gap: "3",
-		children: Object.entries(fields).filter(([, field]) => field.meta.visible !== false).map(([key, field]) => {
+		children: sortFieldsByOrder(fields).filter(([, field]) => field.meta.visible !== false).map(([key, field]) => {
 			const childValue = obj[key];
 			const childOnChange = (v) => {
 				const updated = {};

package/dist/themes/shadcn.d.mts

@@ -1,4 +1,4 @@
-import { r as ComponentResolver } from "../renderer-DXo-rXHJ.mjs";
+import { r as ComponentResolver } from "../renderer-BAGoX4AK.mjs";
 
 //#region src/themes/shadcn.d.ts
 declare const shadcnResolver: ComponentResolver;

package/dist/themes/shadcn.mjs

@@ -1,4 +1,5 @@
 import { toRecord } from "../core/guards.mjs";
+import { sortFieldsByOrder } from "../core/fieldOrder.mjs";
 import { inputId, toReactNode } from "../react/headlessRenderers.mjs";
 import { headlessResolver } from "../react/headless.mjs";
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -102,7 +103,7 @@ function renderObjectContainer(props) {
 		children: [typeof props.meta.description === "string" && /* @__PURE__ */ jsx("h3", {
 			className: "text-lg font-medium",
 			children: props.meta.description
-		}), Object.entries(fields).map(([key, field]) => {
+		}), sortFieldsByOrder(fields).map(([key, field]) => {
 			const childValue = toRecord(obj)[key];
 			const childId = inputId(`${props.path}.${key}`);
 			const childOnChange = (v) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "schema-components",
-    "version": "1.18.0",
+    "version": "1.18.1",
     "description": "React components that render UI from Zod schemas, JSON Schema, and OpenAPI documents",
     "type": "module",
     "main": "./dist/index.mjs",