@jsonforms/core 3.4.1-beta.0 → 3.5.0-beta.0

package/lib/jsonforms-core.cjs.js

@@ -2189,7 +2189,13 @@ var showAsRequired = function (required, hideRequiredAsterisk) {
     return required && !hideRequiredAsterisk;
 };
 var createDefaultValue = function (schema, rootSchema) {
-    var resolvedSchema = Resolve.schema(schema, schema.$ref, rootSchema);
+    var defaultValue = doCreateDefaultValue(schema, rootSchema);
+    return defaultValue === undefined ? {} : defaultValue;
+};
+var doCreateDefaultValue = function (schema, rootSchema) {
+    var resolvedSchema = typeof schema.$ref === 'string'
+        ? Resolve.schema(rootSchema, schema.$ref, rootSchema)
+        : schema;
     if (resolvedSchema.default !== undefined) {
         return extractDefaults(resolvedSchema, rootSchema);
     }
@@ -2201,39 +2207,73 @@ var createDefaultValue = function (schema, rootSchema) {
         }
         return '';
     }
-    else if (hasType(resolvedSchema, 'integer') ||
-        hasType(resolvedSchema, 'number')) {
+    if (hasType(resolvedSchema, 'integer') || hasType(resolvedSchema, 'number')) {
         return 0;
     }
-    else if (hasType(resolvedSchema, 'boolean')) {
+    if (hasType(resolvedSchema, 'boolean')) {
         return false;
     }
-    else if (hasType(resolvedSchema, 'array')) {
+    if (hasType(resolvedSchema, 'array')) {
         return [];
     }
-    else if (hasType(resolvedSchema, 'object')) {
+    if (hasType(resolvedSchema, 'object')) {
         return extractDefaults(resolvedSchema, rootSchema);
     }
-    else if (hasType(resolvedSchema, 'null')) {
+    if (hasType(resolvedSchema, 'null')) {
         return null;
     }
-    else {
-        return {};
+    var combinators = ['oneOf', 'anyOf', 'allOf'];
+    for (var _i = 0, combinators_1 = combinators; _i < combinators_1.length; _i++) {
+        var combinator = combinators_1[_i];
+        if (schema[combinator] && Array.isArray(schema[combinator])) {
+            var combinatorDefault = createDefaultValueForCombinatorSchema(schema[combinator], rootSchema);
+            if (combinatorDefault !== undefined) {
+                return combinatorDefault;
+            }
+        }
+    }
+    return undefined;
+};
+var createDefaultValueForCombinatorSchema = function (combinatorSchemas, rootSchema) {
+    if (combinatorSchemas.length > 0) {
+        for (var _i = 0, combinatorSchemas_1 = combinatorSchemas; _i < combinatorSchemas_1.length; _i++) {
+            var combinatorSchema = combinatorSchemas_1[_i];
+            var result = doCreateDefaultValue(combinatorSchema, rootSchema);
+            if (result !== undefined) {
+                return result;
+            }
+        }
     }
+    return undefined;
 };
 var extractDefaults = function (schema, rootSchema) {
     if (hasType(schema, 'object') && schema.default === undefined) {
-        var result = {};
+        var result_1 = {};
         for (var key in schema.properties) {
             var property = schema.properties[key];
             var resolvedProperty = property.$ref
                 ? Resolve.schema(rootSchema, property.$ref, rootSchema)
                 : property;
-            if (resolvedProperty.default !== undefined) {
-                result[key] = cloneDeep__default["default"](resolvedProperty.default);
+            if (resolvedProperty && resolvedProperty.default !== undefined) {
+                result_1[key] = cloneDeep__default["default"](resolvedProperty.default);
             }
         }
-        return result;
+        if (schema.allOf && Array.isArray(schema.allOf)) {
+            schema.allOf.forEach(function (allOfSchema) {
+                if (allOfSchema && allOfSchema.properties) {
+                    for (var key in allOfSchema.properties) {
+                        var property = allOfSchema.properties[key];
+                        var resolvedProperty = property.$ref
+                            ? Resolve.schema(rootSchema, property.$ref, rootSchema)
+                            : property;
+                        if (resolvedProperty && resolvedProperty.default !== undefined) {
+                            result_1[key] = cloneDeep__default["default"](resolvedProperty.default);
+                        }
+                    }
+                }
+            });
+        }
+        return result_1;
     }
     return cloneDeep__default["default"](schema.default);
 };
@@ -2383,7 +2423,7 @@ var mapStateToArrayControlProps = function (state, ownProps) {
     var _a = mapStateToControlWithDetailProps(state, ownProps), path = _a.path, schema = _a.schema, uischema = _a.uischema, label = _a.label, props = __rest(_a, ["path", "schema", "uischema", "label"]);
     var resolvedSchema = Resolve.schema(schema, 'items', props.rootSchema);
     var childErrors = getSubErrorsAt(path, resolvedSchema)(state);
-    return __assign(__assign({}, props), { label: label, path: path, uischema: uischema, schema: resolvedSchema, childErrors: childErrors, renderers: ownProps.renderers || getRenderers(state), cells: ownProps.cells || getCells(state) });
+    return __assign(__assign({}, props), { label: label, path: path, uischema: uischema, schema: resolvedSchema, arraySchema: schema, childErrors: childErrors, renderers: ownProps.renderers || getRenderers(state), cells: ownProps.cells || getCells(state) });
 };
 var mapDispatchToArrayControlProps = function (dispatch) { return ({
     addItem: function (path, value) { return function () {
@@ -2539,7 +2579,7 @@ var mapStateToArrayLayoutProps = function (state, ownProps) {
     var allErrors = errors +
         (errors.length > 0 && childErrors.length > 0 ? '\n' : '') +
         childErrors;
-    return __assign(__assign({}, props), { label: label, path: path, uischema: uischema, schema: resolvedSchema, data: props.data ? props.data.length : 0, errors: allErrors, minItems: schema.minItems });
+    return __assign(__assign({}, props), { label: label, path: path, uischema: uischema, schema: resolvedSchema, arraySchema: schema, data: props.data ? props.data.length : 0, errors: allErrors, minItems: schema.minItems });
 };
 var mapStateToLabelProps = function (state, props) {
     var uischema = props.uischema;
@@ -2742,6 +2782,7 @@ exports.defaultTimeFormat = defaultTimeFormat;
 exports.defaultTranslator = defaultTranslator;
 exports.deriveLabelForUISchemaElement = deriveLabelForUISchemaElement;
 exports.deriveTypes = deriveTypes;
+exports.doCreateDefaultValue = doCreateDefaultValue;
 exports.encode = encode;
 exports.enumToEnumOptionMapper = enumToEnumOptionMapper;
 exports.errorAt = errorAt;