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

package/lib/jsonforms-core.cjs.js

@@ -328,12 +328,27 @@ exports.RuleEffect = void 0;
     RuleEffect["ENABLE"] = "ENABLE";
     RuleEffect["DISABLE"] = "DISABLE";
 })(exports.RuleEffect || (exports.RuleEffect = {}));
+var isInternationalized = function (element) {
+    return typeof element === 'object' && element !== null && typeof element.i18n === 'string';
+};
 var isGroup = function (layout) {
     return layout.type === 'Group';
 };
 var isLayout = function (uischema) {
     return uischema.elements !== undefined;
 };
+var isScopable = function (obj) {
+    return obj && typeof obj === 'object';
+};
+var isScoped = function (obj) {
+    return isScopable(obj) && typeof obj.scope === 'string';
+};
+var isLabelable = function (obj) {
+    return obj && typeof obj === 'object';
+};
+var isLabeled = function (obj) {
+    return isLabelable(obj) && ['string', 'object'].includes(typeof obj.label);
+};
 
 var move = function (array, index, delta) {
     var newIndex = index + delta;
@@ -450,6 +465,7 @@ var initState = {
     validator: undefined,
     ajv: undefined,
     validationMode: 'ValidateAndShow',
+    additionalErrors: []
 };
 var reuseAjvForSchema = function (ajv, schema) {
     if (schema.hasOwnProperty('id') || schema.hasOwnProperty('$id')) {
@@ -493,6 +509,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 +529,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 +549,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 +669,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; });
@@ -663,8 +697,11 @@ var defaultDataReducer = function (state, action) {
 var extractDefaultData = function (state) { return state; };
 
 var getI18nKeyPrefixBySchema = function (schema, uischema) {
-    var _a, _b, _c;
-    return (_c = (_b = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.i18n) !== null && _b !== void 0 ? _b : schema === null || schema === void 0 ? void 0 : schema.i18n) !== null && _c !== void 0 ? _c : undefined;
+    var _a;
+    if (isInternationalized(uischema)) {
+        return uischema.i18n;
+    }
+    return (_a = schema === null || schema === void 0 ? void 0 : schema.i18n) !== null && _a !== void 0 ? _a : undefined;
 };
 var transformPathToI18nPrefix = function (path) {
     return ((path === null || path === void 0 ? void 0 : path.split('.').filter(function (segment) { return !/^\d+$/.test(segment); }).join('.')) || 'root');
@@ -680,27 +717,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;
         }
@@ -817,7 +854,7 @@ var formatIs = function (expectedFormat) {
     return schemaMatches(function (schema) {
         return !isEmpty__default["default"](schema) &&
             schema.format === expectedFormat &&
-            schema.type === 'string';
+            hasType(schema, 'string');
     });
 };
 var uiTypeIs = function (expected) { return function (uischema) { return !isEmpty__default["default"](uischema) && uischema.type === expected; }; };
@@ -921,10 +958,7 @@ var isObjectArrayWithNesting = function (uischema, schema, rootSchema) {
     }
     var schemaPath = uischema.scope;
     var resolvedSchema = resolveSchema(schema, schemaPath, rootSchema !== null && rootSchema !== void 0 ? rootSchema : schema);
-    var wantedNestingByType = {
-        object: 2,
-        array: 1
-    };
+    var objectDepth = 0;
     if (resolvedSchema !== undefined && resolvedSchema.items !== undefined) {
         if (traverse(resolvedSchema.items, function (val) {
             if (val === schema) {
@@ -933,15 +967,16 @@ var isObjectArrayWithNesting = function (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;
+                }
             }
-            var 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;
         }
@@ -1156,11 +1191,14 @@ var toDataPath = function (schemaPath) {
     return toDataPathSegments(schemaPath).join('.');
 };
 var composeWithUi = function (scopableUi, path) {
+    if (!isScoped(scopableUi)) {
+        return path !== null && path !== void 0 ? path : '';
+    }
     var segments = toDataPathSegments(scopableUi.scope);
-    if (isEmpty__default["default"](segments) && path === undefined) {
-        return '';
+    if (isEmpty__default["default"](segments)) {
+        return path !== null && path !== void 0 ? path : '';
     }
-    return isEmpty__default["default"](segments) ? path : compose(path, segments.join('.'));
+    return compose(path, segments.join('.'));
 };
 var encode = function (segment) { return segment === null || segment === void 0 ? void 0 : segment.replace(/~/g, '~0').replace(/\//g, '~1'); };
 var decode = function (pointerSegment) { return pointerSegment === null || pointerSegment === void 0 ? void 0 : pointerSegment.replace(/~1/g, '/').replace(/~0/, '~'); };
@@ -1415,12 +1453,12 @@ var Resolve = {
     schema: resolveSchema,
     data: resolveData
 };
-var fromScopable = function (scopable) {
+var fromScoped = function (scopable) {
     return toDataPathSegments(scopable.scope).join('.');
 };
 var Paths = {
     compose: compose,
-    fromScopable: fromScopable
+    fromScoped: fromScoped
 };
 var Runtime = {
     isEnabled: function (uischema, data, ajv) {
@@ -1564,8 +1602,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 +1773,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);
@@ -2353,6 +2391,9 @@ exports.isEnumControl = isEnumControl;
 exports.isGroup = isGroup;
 exports.isInherentlyEnabled = isInherentlyEnabled;
 exports.isIntegerControl = isIntegerControl;
+exports.isInternationalized = isInternationalized;
+exports.isLabelable = isLabelable;
+exports.isLabeled = isLabeled;
 exports.isLayout = isLayout;
 exports.isMultiLineControl = isMultiLineControl;
 exports.isNumberControl = isNumberControl;
@@ -2365,6 +2406,8 @@ exports.isOneOfControl = isOneOfControl;
 exports.isOneOfEnumControl = isOneOfEnumControl;
 exports.isPrimitiveArrayControl = isPrimitiveArrayControl;
 exports.isRangeControl = isRangeControl;
+exports.isScopable = isScopable;
+exports.isScoped = isScoped;
 exports.isStringControl = isStringControl;
 exports.isTimeControl = isTimeControl;
 exports.isVisible = isVisible;