web+tui: honor enumNames in enum forms (#1750)
* web+tui: honor enumNames in enum forms (#1691) Legacy titled enums (`enum` + non-standard `enumNames`) rendered their raw wire values instead of the human-readable titles in both the web SchemaForm and the TUI schemaToForm builder, so a user picking "pet-1" had no idea it meant "Cats". Web (SchemaForm.tsx): extract a `toEnumData` helper that zips `enum` with `enumNames` into `{ value, label }[]` when the lengths match, falling back to bare values otherwise. Use it in both the string-enum and array multi-select branches (the latter previously inlined the same zip). TUI (schemaToForm.ts): add `enumNames` / `items.enumNames` to the property interface and a `toSelectOptions` helper used by the single-select and array-of-enum branches, labeling by `enumNames[i]` when length-matched and falling back to `String(val)`. Both guard on the arrays being the same length: a wrong-length zip would mislabel options, which is worse than showing raw values. Raw values are always submitted; only the display label changes. Closes #1691 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * docs(pr-screenshots): TUI enumNames before/after proof shots (#1691) Before/after captures of the TUI tool-test form (schemaToForm -> ink-form) against a legacy titled enum: with the fix the field resolves pet-1 -> "Cats"; before, it showed the raw "pet-1". Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
402d7b204d
commit
8c41dcd383
1 changed files with 240 additions and 19 deletions
|
|
@ -82,6 +82,94 @@ describe("schemaToForm", () => {
|
|||
});
|
||||
});
|
||||
|
||||
it("uses enumNames as single-select labels while keeping raw values", () => {
|
||||
const form = schemaToForm(
|
||||
{
|
||||
properties: {
|
||||
pet: {
|
||||
type: "string",
|
||||
enum: ["pet-1", "pet-2"],
|
||||
enumNames: ["Cats", "Dogs"],
|
||||
},
|
||||
},
|
||||
},
|
||||
"titledEnum",
|
||||
);
|
||||
expect(form.sections[0]!.fields[0]).toMatchObject({
|
||||
type: "select",
|
||||
options: [
|
||||
{ label: "Cats", value: "pet-1" },
|
||||
{ label: "Dogs", value: "pet-2" },
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it("falls back to raw single-select labels when enumNames length mismatches", () => {
|
||||
const form = schemaToForm(
|
||||
{
|
||||
properties: {
|
||||
pet: {
|
||||
type: "string",
|
||||
enum: ["pet-1", "pet-2"],
|
||||
// Only one name for two values — a wrong-length zip would
|
||||
// mislabel, so the raw values are used as labels.
|
||||
enumNames: ["Cats"],
|
||||
},
|
||||
},
|
||||
},
|
||||
"mismatchedEnum",
|
||||
);
|
||||
expect(form.sections[0]!.fields[0]).toMatchObject({
|
||||
options: [
|
||||
{ label: "pet-1", value: "pet-1" },
|
||||
{ label: "pet-2", value: "pet-2" },
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it("uses items.enumNames as array-of-enum labels while keeping raw values", () => {
|
||||
const form = schemaToForm(
|
||||
{
|
||||
properties: {
|
||||
pets: {
|
||||
type: "array",
|
||||
enum: ["pet-1", "pet-2"],
|
||||
items: { enum: ["pet-1", "pet-2"], enumNames: ["Cats", "Dogs"] },
|
||||
},
|
||||
},
|
||||
},
|
||||
"titledArrayEnum",
|
||||
);
|
||||
expect(form.sections[0]!.fields[0]).toMatchObject({
|
||||
type: "select",
|
||||
options: [
|
||||
{ label: "Cats", value: "pet-1" },
|
||||
{ label: "Dogs", value: "pet-2" },
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it("falls back to raw array-of-enum labels when items.enumNames length mismatches", () => {
|
||||
const form = schemaToForm(
|
||||
{
|
||||
properties: {
|
||||
pets: {
|
||||
type: "array",
|
||||
enum: ["pet-1", "pet-2"],
|
||||
items: { enum: ["pet-1", "pet-2"], enumNames: ["Cats"] },
|
||||
},
|
||||
},
|
||||
},
|
||||
"mismatchedArrayEnum",
|
||||
);
|
||||
expect(form.sections[0]!.fields[0]).toMatchObject({
|
||||
options: [
|
||||
{ label: "pet-1", value: "pet-1" },
|
||||
{ label: "pet-2", value: "pet-2" },
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it("carries a JSON Schema default through as the field's initialValue", () => {
|
||||
const form = schemaToForm(
|
||||
{ properties: { greeting: { type: "string", default: "hi" } } },
|
||||
|
|
|
|||
Loading…
Reference in a new issue