Skip to content

fix(options): spread all option's presentation properties into option's root #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2025
Merged

fix(options): spread all option's presentation properties into option's root #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/field/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,7 @@ function convertToOptions(nodeOptions: JsfSchema[]): Array<FieldOption> {
.map((schemaOption) => {
const title = schemaOption.title
const value = schemaOption.const
const presentation = schemaOption['x-jsf-presentation']
const meta = presentation?.meta
const presentation = typeof schemaOption['x-jsf-presentation'] === 'object' ? schemaOption['x-jsf-presentation'] : {}

const result: {
label: string
Expand All @@ -172,15 +171,10 @@ function convertToOptions(nodeOptions: JsfSchema[]): Array<FieldOption> {
value,
}

// Add meta if it exists
if (meta) {
result.meta = meta
}

// Add other properties, without known ones we already handled above
const { title: _, const: __, 'x-jsf-presentation': ___, ...rest } = schemaOption

return { ...result, ...rest }
return { ...result, ...presentation, ...rest }
})
}

Expand Down
73 changes: 73 additions & 0 deletions test/fields.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,79 @@ describe('fields', () => {
},
])
})

it('supports x-jsf-presentation properties inside options', () => {
const schema: JsfSchema = {
type: 'object',
properties: {
plan: {
'type': 'string',
'oneOf': [
{ const: 'free', title: 'Free' },
{ 'const': 'basic', 'title': 'Basic', 'x-jsf-presentation': { meta: { displayCost: '$30.00/mo', originalCost: '$35.00/mo' } } },
{ 'const': 'standard', 'title': 'Standard', 'x-jsf-presentation': { meta: { displayCost: '$50.00/mo' }, recommended: true } },
],
'x-jsf-presentation': {
inputType: 'radio',
},
},
},
}

const fields = buildFieldSchema(schema, 'root', true)!.fields!

expect(fields).toEqual([
{
inputType: 'radio',
type: 'radio',
jsonType: 'string',
isVisible: true,
name: 'plan',
required: false,
options: [
{ label: 'Free', value: 'free' },
{ label: 'Basic', value: 'basic', meta: { displayCost: '$30.00/mo', originalCost: '$35.00/mo' } },
{ label: 'Standard', value: 'standard', meta: { displayCost: '$50.00/mo' }, recommended: true },
],
},
])
})

it('ignores a non-object x-jsf-presentation', () => {
const schema: JsfSchema = {
type: 'object',
properties: {
plan: {
'type': 'string',
'oneOf': [
{ const: 'free', title: 'Free' },
// @ts-expect-error - using an invalid value on purpose
{ 'const': 'basic', 'title': 'Basic', 'x-jsf-presentation': '$30.00/mo' },
],
'x-jsf-presentation': {
inputType: 'radio',
},
},
},
}

const fields = buildFieldSchema(schema, 'root', true)!.fields!

expect(fields).toEqual([
{
inputType: 'radio',
type: 'radio',
jsonType: 'string',
isVisible: true,
name: 'plan',
required: false,
options: [
{ label: 'Free', value: 'free' },
{ label: 'Basic', value: 'basic' },
],
},
])
})
})

describe('input type calculation', () => {
Expand Down