Skip to content

Commit 1689abc

Browse files
committed
dist: update
1 parent c886bec commit 1689abc

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

dist/jsonSchemaLibrary.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/lib/config/settings.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ declare const _default: {
55
templateDefaultOptions: {
66
addOptionalProps: boolean;
77
removeInvalidData: boolean;
8+
extendDefaults: boolean;
89
};
910
};
1011
export default _default;

dist/module/lib/config/settings.js

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
};

dist/module/lib/getTemplate.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import { resolveIfSchema } from "./features/if";
1010
import { mergeAllOfSchema } from "./features/allOf";
1111
import { resolveDependencies } from "./features/dependencies";
1212
import { mergeSchema } from "./mergeSchema";
13-
const defaultOptions = {
14-
addOptionalProps: false,
15-
removeInvalidData: false
16-
};
13+
const defaultOptions = settings.templateDefaultOptions;
1714
let cache;
1815
function shouldResolveRef(schema, pointer) {
1916
const { $ref } = schema;
@@ -336,7 +333,10 @@ function getDefault(schema, templateValue, initValue) {
336333
}
337334
return schema.default;
338335
}
339-
export default (draft, data, schema = draft.rootSchema, opts = defaultOptions) => {
336+
export default (draft, data, schema = draft.rootSchema, opts) => {
340337
cache = {};
341-
return getTemplate(draft, data, schema, "#", opts);
338+
if (opts) {
339+
return getTemplate(draft, data, schema, "#", { ...defaultOptions, ...opts });
340+
}
341+
return getTemplate(draft, data, schema, "#", defaultOptions);
342342
};

0 commit comments

Comments
 (0)