Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/oneof-required-samples.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"openapi-sampler": patch
---

Fixed object samples with `oneOf` `required` so they match exactly one subschema.
42 changes: 41 additions & 1 deletion src/traverse.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,35 @@ function tryInferExample(schema) {
return;
}

function getRequired(schema) {
return Array.isArray(schema && schema.required) ? schema.required : [];
}

// oneOf is exclusive: a property required only by a sibling alternative would
// make the sample match more than one subschema (see issue #151).
function omitSiblingOneOfRequired(sampleValue, schema, selectedRequired) {
if (!sampleValue || typeof sampleValue !== 'object' || Array.isArray(sampleValue)) {
return;
}

const keep = {};
for (const prop of getRequired(schema)) {
keep[prop] = true;
}
for (const prop of selectedRequired) {
keep[prop] = true;
}

for (let i = 1; i < schema.oneOf.length; i++) {
const altRequired = getRequired(schema.oneOf[i]);
for (const prop of altRequired) {
if (!keep[prop]) {
delete sampleValue[prop];
}
}
}
}

export function traverse(schema, options, spec, context) {
// checking circular JS references by checking context
// because context is passed only when traversing through nested objects happens
Expand Down Expand Up @@ -174,11 +203,22 @@ export function traverse(schema, options, spec, context) {
return inferred;
}

const localExample = traverse({ ...schema, oneOf: undefined, anyOf: undefined }, options, spec, context);
const rest = { ...schema, oneOf: undefined, anyOf: undefined };
const selectedRequired = getRequired(selectedSubSchema);

// Lift required from the selected alternative so skipNonRequired sees it.
if (schema.oneOf && selectedRequired.length) {
rest.required = getRequired(rest).concat(selectedRequired);
}

const localExample = traverse(rest, options, spec, context);
const subSchemaExample = traverse(selectedSubSchema, options, spec, context);

if (typeof localExample.value === 'object' && typeof subSchemaExample.value === 'object') {
const mergedExample = mergeDeep(localExample.value, subSchemaExample.value);
if (schema.oneOf) {
omitSiblingOneOfRequired(mergedExample, schema, selectedRequired);
}
return { ...subSchemaExample, value: mergedExample };
}

Expand Down
59 changes: 59 additions & 0 deletions test/integration.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,65 @@ describe('Integration', () => {
expect(result).toEqual(expected);
});

it('should match exactly one oneOf subschema when required is used on alternatives', () => {
schema = {
type: 'object',
properties: {
a: { type: 'string' },
b: { type: 'string' },
},
oneOf: [
{ required: ['a'] },
{ required: ['b'] },
],
};
result = sample(schema);
expected = {
a: 'string'
};
expect(result).toEqual(expected);
});

it('should apply oneOf required when skipNonRequired is true', () => {
schema = {
type: 'object',
properties: {
a: { type: 'string' },
b: { type: 'string' },
},
oneOf: [
{ required: ['a'] },
{ required: ['b'] },
],
};
result = sample(schema, { skipNonRequired: true });
expected = {
a: 'string'
};
expect(result).toEqual(expected);
});

it('should keep properties that are not required by other oneOf subschemas', () => {
schema = {
type: 'object',
properties: {
a: { type: 'string' },
b: { type: 'string' },
c: { type: 'string' },
},
oneOf: [
{ required: ['a'] },
{ required: ['b'] },
],
};
result = sample(schema);
expected = {
a: 'string',
c: 'string'
};
expect(result).toEqual(expected);
});

it('should support anyOf', () => {
schema = {
anyOf: [
Expand Down