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

package/lib/jsonforms-core.esm.js

@@ -292,8 +292,13 @@ var RuleEffect;
     RuleEffect["ENABLE"] = "ENABLE";
     RuleEffect["DISABLE"] = "DISABLE";
 })(RuleEffect || (RuleEffect = {}));
+const isInternationalized = (element) => typeof element === 'object' && element !== null && typeof element.i18n === 'string';
 const isGroup = (layout) => layout.type === 'Group';
 const isLayout = (uischema) => uischema.elements !== undefined;
+const isScopable = (obj) => obj && typeof obj === 'object';
+const isScoped = (obj) => isScopable(obj) && typeof obj.scope === 'string';
+const isLabelable = (obj) => obj && typeof obj === 'object';
+const isLabeled = (obj) => isLabelable(obj) && ['string', 'object'].includes(typeof obj.label);
 
 const move = (array, index, delta) => {
     const newIndex = index + delta;
@@ -356,6 +361,7 @@ const initState = {
     validator: undefined,
     ajv: undefined,
     validationMode: 'ValidateAndShow',
+    additionalErrors: []
 };
 const reuseAjvForSchema = (ajv, schema) => {
     if (schema.hasOwnProperty('id') || schema.hasOwnProperty('$id')) {
@@ -399,6 +405,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 +424,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 +454,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 +473,7 @@ const coreReducer = (state = initState, action) => {
                     errors: isEqual(errors, state.errors) ? state.errors : errors,
                     validator: validator,
                     validationMode: validationMode,
+                    additionalErrors
                 }
                 : state;
         }
@@ -594,7 +617,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));
 
@@ -613,7 +640,10 @@ const defaultDataReducer = (state = [], action) => {
 const extractDefaultData = (state) => state;
 
 const getI18nKeyPrefixBySchema = (schema, uischema) => {
-    return uischema?.options?.i18n ?? schema?.i18n ?? undefined;
+    if (isInternationalized(uischema)) {
+        return uischema.i18n;
+    }
+    return schema?.i18n ?? undefined;
 };
 const transformPathToI18nPrefix = (path) => {
     return (path
@@ -631,27 +661,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;
         }
@@ -769,7 +799,7 @@ const schemaSubPathMatches = (subPath, predicate) => (uischema, schema, rootSche
 const schemaTypeIs = (expectedType) => schemaMatches(schema => !isEmpty(schema) && hasType(schema, expectedType));
 const formatIs = (expectedFormat) => schemaMatches(schema => !isEmpty(schema) &&
     schema.format === expectedFormat &&
-    schema.type === 'string');
+    hasType(schema, 'string'));
 const uiTypeIs = (expected) => (uischema) => !isEmpty(uischema) && uischema.type === expected;
 const optionIs = (optionName, optionValue) => (uischema) => {
     if (isEmpty(uischema)) {
@@ -854,10 +884,7 @@ const isObjectArrayWithNesting = (uischema, schema, rootSchema) => {
     }
     const schemaPath = uischema.scope;
     const resolvedSchema = resolveSchema(schema, schemaPath, rootSchema ?? schema);
-    const wantedNestingByType = {
-        object: 2,
-        array: 1
-    };
+    let objectDepth = 0;
     if (resolvedSchema !== undefined && resolvedSchema.items !== undefined) {
         if (traverse(resolvedSchema.items, val => {
             if (val === schema) {
@@ -866,15 +893,16 @@ const isObjectArrayWithNesting = (uischema, schema, rootSchema) => {
             if (val.$ref !== undefined) {
                 return false;
             }
-            if (typeof val.type !== 'string') {
-                return true;
+            if (hasType(val, 'object')) {
+                objectDepth++;
+                if (objectDepth === 2) {
+                    return true;
+                }
             }
-            const typeCount = wantedNestingByType[val.type];
-            if (typeCount === undefined) {
-                return false;
+            if (hasType(val, 'array')) {
+                return true;
             }
-            wantedNestingByType[val.type] = typeCount - 1;
-            return wantedNestingByType[val.type] === 0;
+            return false;
         }, rootSchema)) {
             return true;
         }
@@ -1065,11 +1093,14 @@ const toDataPath = (schemaPath) => {
     return toDataPathSegments(schemaPath).join('.');
 };
 const composeWithUi = (scopableUi, path) => {
+    if (!isScoped(scopableUi)) {
+        return path ?? '';
+    }
     const segments = toDataPathSegments(scopableUi.scope);
-    if (isEmpty(segments) && path === undefined) {
-        return '';
+    if (isEmpty(segments)) {
+        return path ?? '';
     }
-    return isEmpty(segments) ? path : compose(path, segments.join('.'));
+    return compose(path, segments.join('.'));
 };
 const encode = (segment) => segment?.replace(/~/g, '~0').replace(/\//g, '~1');
 const decode = (pointerSegment) => pointerSegment?.replace(/~1/g, '/').replace(/~0/, '~');
@@ -1303,10 +1334,10 @@ const Resolve = {
     schema: resolveSchema,
     data: resolveData
 };
-const fromScopable = (scopable) => toDataPathSegments(scopable.scope).join('.');
+const fromScoped = (scopable) => toDataPathSegments(scopable.scope).join('.');
 const Paths = {
     compose: compose,
-    fromScopable
+    fromScoped
 };
 const Runtime = {
     isEnabled(uischema, data, ajv) {
@@ -1450,8 +1481,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 +1671,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);
@@ -2148,5 +2179,5 @@ const Helpers = {
     convertToValidClassName
 };
 
-export { ADD_CELL, ADD_DEFAULT_DATA, ADD_RENDERER, ADD_UI_SCHEMA, index as Actions, Draft4, Generate, Helpers, INIT, NOT_APPLICABLE, Paths, REMOVE_CELL, REMOVE_DEFAULT_DATA, REMOVE_RENDERER, REMOVE_UI_SCHEMA, Resolve, RuleEffect, Runtime, SET_AJV, SET_CONFIG, SET_LOCALE, SET_SCHEMA, SET_TRANSLATOR, SET_UISCHEMA, SET_VALIDATION_MODE, index$1 as Test, UPDATE_CORE, UPDATE_DATA, UPDATE_ERRORS, UPDATE_I18N, VALIDATE, and, categorizationHasCategory, cellReducer, clearAllIds, compose, compose as composePaths, composeWithUi, computeLabel, configReducer, controlDefaultProps, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultTranslator, deriveTypes, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAjv, getCells, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, hasCategory, hasEnableRule, hasShowRule, hasType, i18nReducer, init, isAllOfControl, isAnyOfControl, isArrayObjectControl, isBooleanControl, isCategorization, isCategory, isControl, isDateControl, isDateTimeControl, isDescriptionHidden, isEnabled, isEnumControl, isGroup, isInherentlyEnabled, isIntegerControl, isLayout, isMultiLineControl, isNumberControl, isNumberFormatControl, isObjectArray, isObjectArrayControl, isObjectArrayWithNesting, isObjectControl, isOneOfControl, isOneOfEnumControl, isPrimitiveArrayControl, isRangeControl, isStringControl, isTimeControl, isVisible, iterateSchema, jsonFormsReducerConfig, layoutDefaultProps, mapDispatchToArrayControlProps, mapDispatchToCellProps, mapDispatchToControlProps, mapDispatchToMultiEnumProps, mapStateToAllOfProps, mapStateToAnyOfProps, mapStateToArrayControlProps, mapStateToArrayLayoutProps, mapStateToCellProps, mapStateToCombinatorRendererProps, mapStateToControlProps, mapStateToControlWithDetailProps, mapStateToDispatchCellProps, mapStateToEnumControlProps, mapStateToJsonFormsRendererProps, mapStateToLayoutProps, mapStateToMasterListItemProps, mapStateToMultiEnumControlProps, mapStateToOneOfEnumCellProps, mapStateToOneOfEnumControlProps, mapStateToOneOfProps, moveDown, moveUp, not, oneOfToEnumOptionMapper, optionIs, or, rankWith, registerCell, registerDefaultData, registerRenderer, registerUISchema, removeId, rendererReducer, resolveData, resolveSchema, schemaMatches, schemaSubPathMatches, schemaTypeIs, scopeEndIs, scopeEndsWith, setAjv, setConfig, setLocale, setReadonly, setSchema, setTranslator, setUISchema, setValidationMode, showAsRequired, subErrorsAt, toDataPath, toDataPathSegments, transformPathToI18nPrefix, uiTypeIs, uischemaRegistryReducer, unregisterCell, unregisterDefaultData, unregisterRenderer, unregisterUISchema, unsetReadonly, update, updateCore, updateErrors, updateI18n, validate, withIncreasedRank };
+export { ADD_CELL, ADD_DEFAULT_DATA, ADD_RENDERER, ADD_UI_SCHEMA, index as Actions, Draft4, Generate, Helpers, INIT, NOT_APPLICABLE, Paths, REMOVE_CELL, REMOVE_DEFAULT_DATA, REMOVE_RENDERER, REMOVE_UI_SCHEMA, Resolve, RuleEffect, Runtime, SET_AJV, SET_CONFIG, SET_LOCALE, SET_SCHEMA, SET_TRANSLATOR, SET_UISCHEMA, SET_VALIDATION_MODE, index$1 as Test, UPDATE_CORE, UPDATE_DATA, UPDATE_ERRORS, UPDATE_I18N, VALIDATE, and, categorizationHasCategory, cellReducer, clearAllIds, compose, compose as composePaths, composeWithUi, computeLabel, configReducer, controlDefaultProps, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultTranslator, deriveTypes, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAjv, getCells, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, hasCategory, hasEnableRule, hasShowRule, hasType, i18nReducer, init, isAllOfControl, isAnyOfControl, isArrayObjectControl, isBooleanControl, isCategorization, isCategory, isControl, isDateControl, isDateTimeControl, isDescriptionHidden, isEnabled, isEnumControl, isGroup, isInherentlyEnabled, isIntegerControl, isInternationalized, isLabelable, isLabeled, isLayout, isMultiLineControl, isNumberControl, isNumberFormatControl, isObjectArray, isObjectArrayControl, isObjectArrayWithNesting, isObjectControl, isOneOfControl, isOneOfEnumControl, isPrimitiveArrayControl, isRangeControl, isScopable, isScoped, isStringControl, isTimeControl, isVisible, iterateSchema, jsonFormsReducerConfig, layoutDefaultProps, mapDispatchToArrayControlProps, mapDispatchToCellProps, mapDispatchToControlProps, mapDispatchToMultiEnumProps, mapStateToAllOfProps, mapStateToAnyOfProps, mapStateToArrayControlProps, mapStateToArrayLayoutProps, mapStateToCellProps, mapStateToCombinatorRendererProps, mapStateToControlProps, mapStateToControlWithDetailProps, mapStateToDispatchCellProps, mapStateToEnumControlProps, mapStateToJsonFormsRendererProps, mapStateToLayoutProps, mapStateToMasterListItemProps, mapStateToMultiEnumControlProps, mapStateToOneOfEnumCellProps, mapStateToOneOfEnumControlProps, mapStateToOneOfProps, moveDown, moveUp, not, oneOfToEnumOptionMapper, optionIs, or, rankWith, registerCell, registerDefaultData, registerRenderer, registerUISchema, removeId, rendererReducer, resolveData, resolveSchema, schemaMatches, schemaSubPathMatches, schemaTypeIs, scopeEndIs, scopeEndsWith, setAjv, setConfig, setLocale, setReadonly, setSchema, setTranslator, setUISchema, setValidationMode, showAsRequired, subErrorsAt, toDataPath, toDataPathSegments, transformPathToI18nPrefix, uiTypeIs, uischemaRegistryReducer, unregisterCell, unregisterDefaultData, unregisterRenderer, unregisterUISchema, unsetReadonly, update, updateCore, updateErrors, updateI18n, validate, withIncreasedRank };
 //# sourceMappingURL=jsonforms-core.esm.js.map