Skip to content

Commit c886bec

Browse files
committed
fix: retrieve getTemplate default options from global settings and merge input options
1 parent c981b8c commit c886bec

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

lib/config/settings.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ export default {
44
propertyBlacklist: ["_id"],
55
templateDefaultOptions: {
66
addOptionalProps: false,
7-
removeInvalidData: false
7+
removeInvalidData: false,
8+
extendDefaults: true
89
}
910
};

lib/getTemplate.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ export type TemplateOptions = {
2525
extendDefaults?: boolean;
2626
};
2727

28-
const defaultOptions: TemplateOptions = {
29-
addOptionalProps: false,
30-
removeInvalidData: false
31-
};
28+
const defaultOptions: TemplateOptions = settings.templateDefaultOptions;
3229

3330
let cache: Record<string, JsonSchema>;
3431
function shouldResolveRef(schema: JsonSchema, pointer: JsonPointer) {
@@ -455,8 +452,11 @@ export default (
455452
draft: Draft,
456453
data?: any,
457454
schema: JsonSchema = draft.rootSchema,
458-
opts: TemplateOptions = defaultOptions
455+
opts?: TemplateOptions
459456
) => {
460457
cache = {};
461-
return getTemplate(draft, data, schema, "#", opts);
458+
if (opts) {
459+
return getTemplate(draft, data, schema, "#", { ...defaultOptions, ...opts });
460+
}
461+
return getTemplate(draft, data, schema, "#", defaultOptions);
462462
};

0 commit comments

Comments
 (0)