@maif/react-forms 1.0.28 → 1.0.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/react-form.js +1 -1
- package/lib/resolvers/utils.js +6 -11
- package/package.json +1 -1
package/lib/resolvers/utils.js
CHANGED
|
@@ -42,6 +42,9 @@ var resolvers = (_resolvers = {}, _defineProperty(_resolvers, _type.type.string,
|
|
|
42
42
|
}), _resolvers);
|
|
43
43
|
|
|
44
44
|
var buildSubResolver = function buildSubResolver(props, key, dependencies, rawData) {
|
|
45
|
+
var _props$constraints = props.constraints,
|
|
46
|
+
constraints = _props$constraints === void 0 ? [] : _props$constraints;
|
|
47
|
+
|
|
45
48
|
if (props.array || props.isMulti) {
|
|
46
49
|
var subResolver;
|
|
47
50
|
var arrayResolver = yup.array();
|
|
@@ -63,7 +66,7 @@ var buildSubResolver = function buildSubResolver(props, key, dependencies, rawDa
|
|
|
63
66
|
} else if (props.type === _type.type.object && props.schema) {
|
|
64
67
|
var _subResolver = getShapeAndDependencies(props.flow || Object.keys(props.schema), props.schema, dependencies, rawData);
|
|
65
68
|
|
|
66
|
-
return
|
|
69
|
+
return constraints.reduce(function (resolver, constraint) {
|
|
67
70
|
return jsonOrFunctionConstraint(constraint, resolver, key, dependencies);
|
|
68
71
|
}, yup.object().shape(_subResolver.shape, dependencies));
|
|
69
72
|
} else if (props.type === _type.type.object && props.conditionalSchema) {
|
|
@@ -90,11 +93,11 @@ var buildSubResolver = function buildSubResolver(props, key, dependencies, rawDa
|
|
|
90
93
|
|
|
91
94
|
var _subResolver2 = getShapeAndDependencies(flow || Object.keys(schema), schema, dependencies, rawData);
|
|
92
95
|
|
|
93
|
-
return
|
|
96
|
+
return constraints.reduce(function (resolver, constraint) {
|
|
94
97
|
return jsonOrFunctionConstraint(constraint, resolver, key, dependencies);
|
|
95
98
|
}, yup.object().shape(_subResolver2.shape, dependencies));
|
|
96
99
|
} else {
|
|
97
|
-
return
|
|
100
|
+
return constraints.reduce(function (resolver, constraint) {
|
|
98
101
|
return jsonOrFunctionConstraint(constraint, resolver, key, dependencies);
|
|
99
102
|
}, resolvers[props.type]());
|
|
100
103
|
}
|
|
@@ -118,14 +121,6 @@ var getShapeAndDependencies = function getShapeAndDependencies(flow, schema) {
|
|
|
118
121
|
return _objectSpread(_objectSpread({}, resolvers), getShapeAndDependencies(key.flow, schema, dependencies, rawData).shape);
|
|
119
122
|
}
|
|
120
123
|
|
|
121
|
-
console.group('get resolver');
|
|
122
|
-
console.debug({
|
|
123
|
-
schemaBykey: schema[key],
|
|
124
|
-
key: key,
|
|
125
|
-
dependencies: dependencies,
|
|
126
|
-
rawData: rawData
|
|
127
|
-
});
|
|
128
|
-
console.groupEnd();
|
|
129
124
|
var resolver = buildSubResolver(schema[key], key, dependencies, rawData);
|
|
130
125
|
return _objectSpread(_objectSpread({}, resolvers), {}, _defineProperty({}, key, resolver));
|
|
131
126
|
}, {});
|