@jsonforms/core 3.0.0-beta.2 → 3.0.0-beta.3

package/lib/jsonforms-core.cjs.js

@@ -450,6 +450,7 @@ var initState = {
     validator: undefined,
     ajv: undefined,
     validationMode: 'ValidateAndShow',
+    additionalErrors: []
 };
 var reuseAjvForSchema = function (ajv, schema) {
     if (schema.hasOwnProperty('id') || schema.hasOwnProperty('$id')) {
@@ -493,6 +494,18 @@ var hasValidationModeOption = function (option) {
     }
     return false;
 };
+var hasAdditionalErrorsOption = function (option) {
+    if (option) {
+        return option.additionalErrors !== undefined;
+    }
+    return false;
+};
+var getAdditionalErrors = function (state, action) {
+    if (action && hasAdditionalErrorsOption(action.options)) {
+        return action.options.additionalErrors;
+    }
+    return state.additionalErrors;
+};
 var coreReducer = function (state, action) {
     if (state === void 0) { state = initState; }
     switch (action.type) {
@@ -501,7 +514,8 @@ var coreReducer = function (state, action) {
             var validationMode = getValidationMode(state, action);
             var v = validationMode === 'NoValidation' ? undefined : thisAjv.compile(action.schema);
             var e = validate(v, action.data);
-            return __assign(__assign({}, state), { data: action.data, schema: action.schema, uischema: action.uischema, errors: e, validator: v, ajv: thisAjv, validationMode: validationMode });
+            var additionalErrors = getAdditionalErrors(state, action);
+            return __assign(__assign({}, state), { data: action.data, schema: action.schema, uischema: action.uischema, additionalErrors: additionalErrors, errors: e, validator: v, ajv: thisAjv, validationMode: validationMode });
         }
         case UPDATE_CORE: {
             var thisAjv = getOrCreateAjv(state, action);
@@ -520,15 +534,17 @@ var coreReducer = function (state, action) {
             else if (state.data !== action.data) {
                 errors = validate(validator, action.data);
             }
+            var additionalErrors = getAdditionalErrors(state, action);
             var stateChanged = state.data !== action.data ||
                 state.schema !== action.schema ||
                 state.uischema !== action.uischema ||
                 state.ajv !== thisAjv ||
                 state.errors !== errors ||
                 state.validator !== validator ||
-                state.validationMode !== validationMode;
+                state.validationMode !== validationMode ||
+                state.additionalErrors !== additionalErrors;
             return stateChanged
-                ? __assign(__assign({}, state), { data: action.data, schema: action.schema, uischema: action.uischema, ajv: thisAjv, errors: isEqual__default["default"](errors, state.errors) ? state.errors : errors, validator: validator, validationMode: validationMode }) : state;
+                ? __assign(__assign({}, state), { data: action.data, schema: action.schema, uischema: action.uischema, ajv: thisAjv, errors: isEqual__default["default"](errors, state.errors) ? state.errors : errors, validator: validator, validationMode: validationMode, additionalErrors: additionalErrors }) : state;
         }
         case SET_AJV: {
             var currentAjv = action.ajv;
@@ -638,7 +654,10 @@ var isObjectSchema$1 = function (schema) {
 };
 var filteredErrorKeywords = ['additionalProperties', 'allOf', 'anyOf', 'oneOf'];
 var getErrorsAt = function (instancePath, schema, matchPath) { return function (state) {
-    return errorsAt(instancePath, schema, matchPath)(state.validationMode === 'ValidateAndHide' ? [] : state.errors);
+    var _a, _b;
+    var errors = (_a = state.errors) !== null && _a !== void 0 ? _a : [];
+    var additionalErrors = (_b = state.additionalErrors) !== null && _b !== void 0 ? _b : [];
+    return errorsAt(instancePath, schema, matchPath)(state.validationMode === 'ValidateAndHide' ? additionalErrors : __spreadArray(__spreadArray([], errors), additionalErrors));
 }; };
 var errorAt = function (instancePath, schema) {
     return getErrorsAt(instancePath, schema, function (path) { return path === instancePath; });
@@ -680,27 +699,27 @@ var defaultTranslator = function (_id, defaultMessage) { return defaultMessage;
 var defaultErrorTranslator = function (error, t, uischema) {
     var _a;
     var i18nKey = getI18nKey(error.parentSchema, uischema, getControlPath(error), "error." + error.keyword);
-    var specializedKeywordMessage = t(i18nKey, undefined);
+    var specializedKeywordMessage = t(i18nKey, undefined, { error: error });
     if (specializedKeywordMessage !== undefined) {
         return specializedKeywordMessage;
     }
-    var genericKeywordMessage = t("error." + error.keyword, undefined);
+    var genericKeywordMessage = t("error." + error.keyword, undefined, { error: error });
     if (genericKeywordMessage !== undefined) {
         return genericKeywordMessage;
     }
-    var messageCustomization = t(error.message, undefined);
+    var messageCustomization = t(error.message, undefined, { error: error });
     if (messageCustomization !== undefined) {
         return messageCustomization;
     }
     if (error.keyword === 'required' && ((_a = error.message) === null || _a === void 0 ? void 0 : _a.startsWith('must have required property'))) {
-        return t('is a required property', 'is a required property');
+        return t('is a required property', 'is a required property', { error: error });
     }
     return error.message;
 };
 var getCombinedErrorMessage = function (errors, et, t, schema, uischema, path) {
     if (errors.length > 0 && t) {
         var customErrorKey = getI18nKey(schema, uischema, path, 'error.custom');
-        var specializedErrorMessage = t(customErrorKey, undefined);
+        var specializedErrorMessage = t(customErrorKey, undefined, { schema: schema, uischema: uischema, path: path, errors: errors });
         if (specializedErrorMessage !== undefined) {
             return specializedErrorMessage;
         }
@@ -1564,8 +1583,8 @@ var mapStateToControlProps = function (state, ownProps) {
     var schema = resolvedSchema !== null && resolvedSchema !== void 0 ? resolvedSchema : rootSchema;
     var t = getTranslator()(state);
     var te = getErrorTranslator()(state);
-    var i18nLabel = t(getI18nKey(schema, uischema, path, 'label'), label);
-    var i18nDescription = t(getI18nKey(schema, uischema, path, 'description'), description);
+    var i18nLabel = t(getI18nKey(schema, uischema, path, 'label'), label, { schema: schema, uischema: uischema, path: path, errors: errors });
+    var i18nDescription = t(getI18nKey(schema, uischema, path, 'description'), description, { schema: schema, uischema: uischema, path: path, errors: errors });
     var i18nErrorMessage = getCombinedErrorMessage(errors, te, t, schema, uischema, path);
     return {
         data: data,
@@ -1735,7 +1754,7 @@ var mapStateToJsonFormsRendererProps = function (state, ownProps) {
     var uischema = ownProps.uischema;
     if (uischema === undefined) {
         if (ownProps.schema) {
-            uischema = findUISchema(state.jsonforms.uischemas, ownProps.schema, undefined, ownProps.path);
+            uischema = findUISchema(state.jsonforms.uischemas, ownProps.schema, undefined, ownProps.path, undefined, undefined, state.jsonforms.core.schema);
         }
         else {
             uischema = getUiSchema(state);