Skip to content
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

Jump to bottom

fix(core): Disable schema caching in AJV instance #2201

Merged
merged 1 commit into from
Nov 13, 2023
Merged

fix(core): Disable schema caching in AJV instance #2201

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
23 changes: 3 additions & 20 deletions packages/core/src/reducers/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,6 @@ const initState: JsonFormsCore = {
additionalErrors: [],
};

const reuseAjvForSchema = (ajv: Ajv, schema: JsonSchema): Ajv => {
if (
Object.prototype.hasOwnProperty.call(schema, 'id') ||
Object.prototype.hasOwnProperty.call(schema, '$id')
) {
ajv.removeSchema(schema);
}
return ajv;
};

const getOrCreateAjv = (
state: JsonFormsCore,
action?: InitAction | UpdateCoreAction
Expand All @@ -115,12 +105,7 @@ const getOrCreateAjv = (
}
}
}
if (state.ajv) {
return action?.schema
? reuseAjvForSchema(state.ajv, action.schema)
: state.ajv;
}
return createAjv();
return state.ajv ? state.ajv : createAjv();
};

const hasAjvOption = (option: any): option is InitActionOptions => {
Expand Down Expand Up @@ -255,7 +240,7 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
const needsNewValidator =
action.schema && state.ajv && state.validationMode !== 'NoValidation';
const v = needsNewValidator
? reuseAjvForSchema(state.ajv, action.schema).compile(action.schema)
? state.ajv.compile(action.schema)
: state.validator;
const errors = validate(v, state.data);
return {
Expand Down Expand Up @@ -326,9 +311,7 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
};
}
if (state.validationMode === 'NoValidation') {
const validator = reuseAjvForSchema(state.ajv, state.schema).compile(
state.schema
);
const validator = state.ajv.compile(state.schema);
const errors = validate(validator, state.data);
return {
...state,
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/util/validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export const createAjv = (options?: Options) => {
allErrors: true,
verbose: true,
strict: false,
addUsedSchema: false,
...options,
});
addFormats(ajv);
Expand Down