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

package/lib/jsonforms-core.esm.js

@@ -356,6 +356,7 @@ const initState = {
     validator: undefined,
     ajv: undefined,
     validationMode: 'ValidateAndShow',
+    additionalErrors: []
 };
 const reuseAjvForSchema = (ajv, schema) => {
     if (schema.hasOwnProperty('id') || schema.hasOwnProperty('$id')) {
@@ -399,6 +400,18 @@ const hasValidationModeOption = (option) => {
     }
     return false;
 };
+const hasAdditionalErrorsOption = (option) => {
+    if (option) {
+        return option.additionalErrors !== undefined;
+    }
+    return false;
+};
+const getAdditionalErrors = (state, action) => {
+    if (action && hasAdditionalErrorsOption(action.options)) {
+        return action.options.additionalErrors;
+    }
+    return state.additionalErrors;
+};
 const coreReducer = (state = initState, action) => {
     switch (action.type) {
         case INIT: {
@@ -406,11 +419,13 @@ const coreReducer = (state = initState, action) => {
             const validationMode = getValidationMode(state, action);
             const v = validationMode === 'NoValidation' ? undefined : thisAjv.compile(action.schema);
             const e = validate(v, action.data);
+            const additionalErrors = getAdditionalErrors(state, action);
             return {
                 ...state,
                 data: action.data,
                 schema: action.schema,
                 uischema: action.uischema,
+                additionalErrors,
                 errors: e,
                 validator: v,
                 ajv: thisAjv,
@@ -434,13 +449,15 @@ const coreReducer = (state = initState, action) => {
             else if (state.data !== action.data) {
                 errors = validate(validator, action.data);
             }
+            const additionalErrors = getAdditionalErrors(state, action);
             const 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
                 ? {
                     ...state,
@@ -451,6 +468,7 @@ const coreReducer = (state = initState, action) => {
                     errors: isEqual(errors, state.errors) ? state.errors : errors,
                     validator: validator,
                     validationMode: validationMode,
+                    additionalErrors
                 }
                 : state;
         }
@@ -594,7 +612,11 @@ const isObjectSchema$1 = (schema) => {
     return schema?.type === 'object' || !!schema?.properties;
 };
 const filteredErrorKeywords = ['additionalProperties', 'allOf', 'anyOf', 'oneOf'];
-const getErrorsAt = (instancePath, schema, matchPath) => (state) => errorsAt(instancePath, schema, matchPath)(state.validationMode === 'ValidateAndHide' ? [] : state.errors);
+const getErrorsAt = (instancePath, schema, matchPath) => (state) => {
+    const errors = state.errors ?? [];
+    const additionalErrors = state.additionalErrors ?? [];
+    return errorsAt(instancePath, schema, matchPath)(state.validationMode === 'ValidateAndHide' ? additionalErrors : [...errors, ...additionalErrors]);
+};
 const errorAt = (instancePath, schema) => getErrorsAt(instancePath, schema, path => path === instancePath);
 const subErrorsAt = (instancePath, schema) => getErrorsAt(instancePath, schema, path => path.startsWith(instancePath));
 
@@ -631,27 +653,27 @@ const getI18nKey = (schema, uischema, path, key) => {
 const defaultTranslator = (_id, defaultMessage) => defaultMessage;
 const defaultErrorTranslator = (error, t, uischema) => {
     const i18nKey = getI18nKey(error.parentSchema, uischema, getControlPath(error), `error.${error.keyword}`);
-    const specializedKeywordMessage = t(i18nKey, undefined);
+    const specializedKeywordMessage = t(i18nKey, undefined, { error });
     if (specializedKeywordMessage !== undefined) {
         return specializedKeywordMessage;
     }
-    const genericKeywordMessage = t(`error.${error.keyword}`, undefined);
+    const genericKeywordMessage = t(`error.${error.keyword}`, undefined, { error });
     if (genericKeywordMessage !== undefined) {
         return genericKeywordMessage;
     }
-    const messageCustomization = t(error.message, undefined);
+    const messageCustomization = t(error.message, undefined, { error });
     if (messageCustomization !== undefined) {
         return messageCustomization;
     }
     if (error.keyword === 'required' && error.message?.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 });
     }
     return error.message;
 };
 const getCombinedErrorMessage = (errors, et, t, schema, uischema, path) => {
     if (errors.length > 0 && t) {
         const customErrorKey = getI18nKey(schema, uischema, path, 'error.custom');
-        const specializedErrorMessage = t(customErrorKey, undefined);
+        const specializedErrorMessage = t(customErrorKey, undefined, { schema, uischema, path, errors });
         if (specializedErrorMessage !== undefined) {
             return specializedErrorMessage;
         }
@@ -1450,8 +1472,8 @@ const mapStateToControlProps = (state, ownProps) => {
     const schema = resolvedSchema ?? rootSchema;
     const t = getTranslator()(state);
     const te = getErrorTranslator()(state);
-    const i18nLabel = t(getI18nKey(schema, uischema, path, 'label'), label);
-    const i18nDescription = t(getI18nKey(schema, uischema, path, 'description'), description);
+    const i18nLabel = t(getI18nKey(schema, uischema, path, 'label'), label, { schema, uischema, path, errors });
+    const i18nDescription = t(getI18nKey(schema, uischema, path, 'description'), description, { schema, uischema, path, errors });
     const i18nErrorMessage = getCombinedErrorMessage(errors, te, t, schema, uischema, path);
     return {
         data,
@@ -1640,7 +1662,7 @@ const mapStateToJsonFormsRendererProps = (state, ownProps) => {
     let 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);