Three findings (one inline, two in the suppressed block), all valid.
1. `toConstOptions` still stringified every non-null `const`, so
`items: { anyOf: [{ const: 1 }, { const: 2 }] }` submitted `["1"]` where
the schema says `[1]`. Same wrong-type-on-the-wire problem that keeps a
numeric `enum` off the select path, so it gets the same answer: only a
string `const` is selectable, anything else falls to the JSON editor
where the value keeps its type.
2. `hasMissingRequiredFields` derived null admission from the *renderer's*
collapse, which is narrower on purpose — it only flattens a two-member
union. So `anyOf: [string, number, null]` renders through the JSON
fallback (where `null` is typeable) yet was still marked missing,
disabling submit on a value the schema accepts. Null admission is a
validity question, not a rendering one, so it is now its own predicate:
`admitsNull` in core, recognizing `nullable`, `type: "null"`,
`type: [..., "null"]`, and a null branch anywhere in an `anyOf`/`oneOf`
of any size.
3. Nothing exercised the `record_shipment` preset — the web and TUI tests
build the `anyOf` shape by hand, which verifies the renderers but
*assumes* the premise the whole fix rests on: that Zod's `.nullish()`
emits `anyOf: [<branch>, { type: "null" }]` with the enum on the branch.
A Zod output change or a registry typo would leave every unit test green
while the documented reproduction server quietly stopped reproducing.
Added an integration test that boots the preset over HTTP, asserts the
wire shape, and runs it back through the collapse — following the
`duplicate-tool-names.test.ts` precedent, which exists for the same
reason (#1957).
Signed-off-by: cliffhall <cliff@futurescale.com>
224 lines
8.3 KiB
TypeScript
224 lines
8.3 KiB
TypeScript
/**
|
|
* Flattening of the two JSON Schema encodings of "this type, **or** null" into
|
|
* the plain type a form renderer can dispatch on.
|
|
*
|
|
* Shared because both form builders — the web client's `SchemaForm` and the
|
|
* TUI's `schemaToForm` — dispatch on a *single* `type` string, and so both miss
|
|
* a nullable field entirely without this step (#1928, #2015). Keeping one copy
|
|
* is what stops the two clients from disagreeing about which schemas they can
|
|
* render; the alternative was two implementations of the same subtle predicate.
|
|
*/
|
|
|
|
/**
|
|
* JSON Schema type names a form renderer can build a widget for.
|
|
*
|
|
* `"null"` is deliberately absent: it is the branch a nullable union is being
|
|
* flattened *away* from, and there is no widget for a field whose only
|
|
* permitted value is `null`.
|
|
*/
|
|
const RENDERABLE_TYPES = [
|
|
"string",
|
|
"number",
|
|
"integer",
|
|
"boolean",
|
|
"array",
|
|
"object",
|
|
] as const;
|
|
|
|
/** A `type` name the collapse is willing to produce. */
|
|
export type RenderableType = (typeof RENDERABLE_TYPES)[number];
|
|
|
|
function isRenderableType(type: unknown): type is RenderableType {
|
|
return RENDERABLE_TYPES.includes(type as RenderableType);
|
|
}
|
|
|
|
/**
|
|
* The keywords {@link normalizeNullableUnion} reads. Both clients' own schema
|
|
* types are structurally assignable to this, so neither has to adopt the
|
|
* other's — the shape is deliberately the minimum needed to *recognize* a
|
|
* nullable union, not a full JSON Schema model.
|
|
*/
|
|
export interface NullableUnionSchema {
|
|
type?: string | string[];
|
|
enum?: unknown[];
|
|
anyOf?: readonly unknown[];
|
|
// Read only by `admitsNull`, which considers encodings the collapse itself
|
|
// declines to flatten.
|
|
oneOf?: readonly unknown[];
|
|
nullable?: boolean;
|
|
}
|
|
|
|
/** Narrow an `anyOf` member to a readable object, or `null` if it isn't one. */
|
|
function toBranch(value: unknown): Record<string, unknown> | null {
|
|
if (typeof value !== "object" || value === null || Array.isArray(value)) {
|
|
return null;
|
|
}
|
|
return value as Record<string, unknown>;
|
|
}
|
|
|
|
/**
|
|
* Whether an `enum` is one that can be rendered as a string-valued dropdown.
|
|
*
|
|
* JSON Schema's `enum` is untyped — `[1, 2]`, `[true, false]`, and `[null]` are
|
|
* all legal — so a bare `{ enum: [...] }` does **not** imply strings. Guessing
|
|
* `"string"` for a numeric enum would hand non-strings to a renderer that has
|
|
* declared them `string[]`: the web `Select` would receive numbers, and the TUI
|
|
* would `String(...)` them and submit `"1"` where the server expects `1`. So
|
|
* only an all-string enum earns the inference; anything else stays on the
|
|
* fallback path, which renders the value honestly as JSON.
|
|
*
|
|
* Exported because the same question decides whether a *dispatcher* may route
|
|
* an enum to a select at all. The TUI's does, and its options are stringified,
|
|
* so an unguarded numeric enum there submits `"1"` where the server wants `1`.
|
|
*/
|
|
export function isStringEnum(value: unknown): boolean {
|
|
return (
|
|
Array.isArray(value) &&
|
|
value.length > 0 &&
|
|
value.every((member) => typeof member === "string")
|
|
);
|
|
}
|
|
|
|
/**
|
|
* The result of a collapse that actually matched. Spelled out rather than
|
|
* reusing `T` because the collapse genuinely changes two of `T`'s fields:
|
|
* `type` becomes a single renderable name (never an array, never `"null"`),
|
|
* and `anyOf` is cleared. Returning `T` for these would let a caller whose `T`
|
|
* types `type` as an array go on treating it as one after it has become a
|
|
* string, or dereference an `anyOf` that is now `undefined`.
|
|
*
|
|
* Note this cannot make the *hoist* sound: an `anyOf` branch is `unknown`, so
|
|
* any keyword lifted off it is whatever the server sent, however `T` declares
|
|
* it. {@link isStringEnum} validates the one keyword the renderers dereference
|
|
* as a typed array (`enum`); the rest reach widgets that read them defensively.
|
|
*/
|
|
export type NormalizedNullableUnion<T extends NullableUnionSchema> = Omit<
|
|
T,
|
|
"type" | "anyOf"
|
|
> & {
|
|
type?: RenderableType;
|
|
anyOf?: undefined;
|
|
nullable?: boolean;
|
|
};
|
|
|
|
/**
|
|
* Build the collapsed schema.
|
|
*
|
|
* The assertion is needed because the spread merges an unresolved generic `T`
|
|
* with an `unknown` branch, and `NormalizedNullableUnion<T>`'s `Omit` stays
|
|
* deferred while `T` is open — so TS cannot verify the two line up even though
|
|
* every field is set right here. Isolated in this one function so the exported
|
|
* signature carries the contract and nothing else has to assert it.
|
|
*/
|
|
function collapsed<T extends NullableUnionSchema>(
|
|
schema: T,
|
|
branch: Record<string, unknown> | undefined,
|
|
type: RenderableType,
|
|
): NormalizedNullableUnion<T> {
|
|
return {
|
|
...schema,
|
|
...branch,
|
|
type,
|
|
anyOf: undefined,
|
|
nullable: true,
|
|
} as NormalizedNullableUnion<T>;
|
|
}
|
|
|
|
/**
|
|
* Whether a schema permits an explicit `null`.
|
|
*
|
|
* Deliberately **independent of {@link normalizeNullableUnion}**, which is a
|
|
* *renderer* question — "can this become one widget?" — and is therefore
|
|
* narrower on purpose: it only collapses a two-member union. Null admission is
|
|
* a *validity* question and has no such limit, so
|
|
* `anyOf: [{ type: "string" }, { type: "number" }, { type: "null" }]` admits
|
|
* null even though it renders through the JSON fallback. Deriving one from the
|
|
* other would make a form reject a value its own schema accepts, which is why
|
|
* these are two functions rather than a `.nullable` flag read off the collapse.
|
|
*
|
|
* Recognizes every encoding the collapse does, plus the ones it declines:
|
|
* `nullable: true`, `type: "null"`, `type: [..., "null"]`, and a `"null"`
|
|
* branch anywhere in an `anyOf` or `oneOf` of any size.
|
|
*/
|
|
export function admitsNull(schema: NullableUnionSchema): boolean {
|
|
if (schema.nullable === true) {
|
|
return true;
|
|
}
|
|
if (schema.type === "null") {
|
|
return true;
|
|
}
|
|
if (Array.isArray(schema.type) && schema.type.includes("null")) {
|
|
return true;
|
|
}
|
|
return [schema.anyOf, schema.oneOf].some((branches) =>
|
|
branches?.some((entry) => {
|
|
const branch = toBranch(entry);
|
|
if (branch === null) {
|
|
return false;
|
|
}
|
|
return (
|
|
branch.type === "null" ||
|
|
(Array.isArray(branch.type) && branch.type.includes("null"))
|
|
);
|
|
}),
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Collapse a nullable union — what Zod's `.nullish()` / `.nullable()` and
|
|
* FastMCP's optional arguments emit — into `{ type: <T>, nullable: true }`.
|
|
*
|
|
* Two encodings mean the same thing and are both handled:
|
|
*
|
|
* - `anyOf: [<branch>, { type: "null" }]` — the branch's *own* keywords are
|
|
* hoisted onto the result, because that is where the detail a renderer needs
|
|
* lives. A nullable enum compiles to
|
|
* `anyOf: [{ type: "string", enum: [...] }, { type: "null" }]`, so hoisting
|
|
* `enum` is what makes it a dropdown rather than a raw-JSON fallback (#1928).
|
|
* The branch also wins over the wrapper on any shared key, matching v1.x.
|
|
* - `type: [<T>, "null"]` — the keywords already sit at the top level, so only
|
|
* `type` collapses.
|
|
*
|
|
* Anything else — a union of two real types, a three-member `anyOf`, a branch
|
|
* whose type has no widget — is returned **by identity**, so a caller can use
|
|
* `===` to tell that nothing was recognized.
|
|
*
|
|
* @param schema The schema to normalize
|
|
* @returns A flattened copy, or `schema` itself when no nullable-union pattern
|
|
* matches
|
|
*/
|
|
export function normalizeNullableUnion<T extends NullableUnionSchema>(
|
|
schema: T,
|
|
): T | NormalizedNullableUnion<T> {
|
|
if (schema.anyOf?.length === 2) {
|
|
const branches = schema.anyOf.map(toBranch);
|
|
const nullBranch = branches.find((entry) => entry?.type === "null");
|
|
const branch = branches.find(
|
|
(entry) => entry !== null && entry.type !== "null",
|
|
);
|
|
|
|
if (nullBranch && branch) {
|
|
// A branch may carry an `enum` and no `type`; JSON Schema allows that, and
|
|
// an all-string enum is unambiguously a string field. See isStringEnum for
|
|
// why a non-string enum deliberately does not get the same treatment.
|
|
const type =
|
|
branch.type ?? (isStringEnum(branch.enum) ? "string" : undefined);
|
|
if (isRenderableType(type)) {
|
|
return collapsed(schema, branch, type);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (
|
|
Array.isArray(schema.type) &&
|
|
schema.type.length === 2 &&
|
|
schema.type.includes("null")
|
|
) {
|
|
const type = schema.type.find((member) => member !== "null");
|
|
if (isRenderableType(type)) {
|
|
return collapsed(schema, undefined, type);
|
|
}
|
|
}
|
|
|
|
return schema;
|
|
}
|