Skip to content

Merge deep anyOf enums #42

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

Open
lmestel wants to merge 1 commit into
base: next
Choose a base branch
from
Open

Merge deep anyOf enums #42

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
29 changes: 19 additions & 10 deletions src/util/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ import { pascalCase } from 'change-case';
const readJSON = fsExtra.readJSON;
const $RefParser = refParser.default;

const deepValue = (obj: any, path: string) => {
for (const key of path.split('/')) {
obj = obj[key];
}
return obj;
};

// TODO this one, too, is a poor mans version of @kickstartds/jsonschema-utils mergeAnyOfEnums
// which is also used inside the kickstartDS-schema-toolkit for the same purpose
// Should vanish with the rest of the duplicated JSON Schema stuff here
Expand All @@ -36,19 +43,20 @@ const mergeAnyOfEnums = (schema: JSONSchema7) => {
traverse(schema, {
cb: (subSchema, pointer, rootSchema) => {
const propertyName = pointer.split('/').pop();
const targetPath = pointer.replace(/^\/allOf\/\d+\//, '');
const targetSchemaIsTypeString = (obj: any) =>
deepValue(obj, targetPath)?.type === 'string';

if (
propertyName &&
subSchema.anyOf &&
subSchema.anyOf.length === 2 &&
subSchema.anyOf.every(
(anyOf: any) => anyOf.type === 'string' && anyOf.enum
) &&
rootSchema.allOf &&
rootSchema.allOf.length === 2 &&
rootSchema.allOf.some(
(allOf: any) =>
allOf.properties[propertyName || '']?.type === 'string'
)
rootSchema.allOf.some(targetSchemaIsTypeString)
) {
subSchema.type = subSchema.anyOf[0].type;
subSchema.default = subSchema.anyOf[0].default;
Expand All @@ -63,12 +71,13 @@ const mergeAnyOfEnums = (schema: JSONSchema7) => {
[]
);

delete rootSchema.allOf[
rootSchema.allOf.findIndex(
(allOf: any) =>
allOf.properties[propertyName || '']?.type === 'string'
)
].properties[propertyName || ''];
const targetParentToDelete = deepValue(
rootSchema.allOf[
rootSchema.allOf.findIndex(targetSchemaIsTypeString)
],
targetPath.replace(new RegExp(`/${propertyName}$`), '')
);
delete targetParentToDelete[propertyName];
delete subSchema.anyOf;
}
},
Expand Down