@jsonforms/core 3.0.0-beta.4 → 3.0.0-rc.1

package/lib/jsonforms-core.cjs.js

@@ -337,6 +337,18 @@ var isGroup = function (layout) {
 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', 'boolean'].includes(typeof obj.label);
+};
 
 var move = function (array, index, delta) {
     var newIndex = index + delta;
@@ -732,6 +744,18 @@ var getCombinedErrorMessage = function (errors, et, t, schema, uischema, path) {
     }
     return formatErrorMessage(errors.map(function (error) { return et(error, t, uischema); }));
 };
+var deriveLabelForUISchemaElement = function (uischema, t) {
+    if (uischema.label === false) {
+        return undefined;
+    }
+    if ((uischema.label === undefined || uischema.label === null || uischema.label === true) && !isInternationalized(uischema)) {
+        return undefined;
+    }
+    var stringifiedLabel = typeof uischema.label === 'string' ? uischema.label : JSON.stringify(uischema.label);
+    var i18nKeyPrefix = getI18nKeyPrefixBySchema(undefined, uischema);
+    var i18nKey = typeof i18nKeyPrefix === 'string' ? i18nKeyPrefix + ".label" : stringifiedLabel;
+    return t(i18nKey, stringifiedLabel, { uischema: uischema });
+};
 
 var defaultJsonFormsI18nState = {
     locale: 'en',
@@ -800,7 +824,7 @@ var NOT_APPLICABLE = -1;
 var isControl = function (uischema) {
     return !isEmpty__default["default"](uischema) && uischema.scope !== undefined;
 };
-var schemaMatches = function (predicate) { return function (uischema, schema, rootSchema) {
+var schemaMatches = function (predicate) { return function (uischema, schema, context) {
     if (isEmpty__default["default"](uischema) || !isControl(uischema)) {
         return false;
     }
@@ -813,27 +837,27 @@ var schemaMatches = function (predicate) { return function (uischema, schema, ro
     }
     var currentDataSchema = schema;
     if (hasType(schema, 'object')) {
-        currentDataSchema = resolveSchema(schema, schemaPath, rootSchema);
+        currentDataSchema = resolveSchema(schema, schemaPath, context === null || context === void 0 ? void 0 : context.rootSchema);
     }
     if (currentDataSchema === undefined) {
         return false;
     }
-    return predicate(currentDataSchema, rootSchema);
+    return predicate(currentDataSchema, context === null || context === void 0 ? void 0 : context.rootSchema);
 }; };
-var schemaSubPathMatches = function (subPath, predicate) { return function (uischema, schema, rootSchema) {
+var schemaSubPathMatches = function (subPath, predicate) { return function (uischema, schema, context) {
     if (isEmpty__default["default"](uischema) || !isControl(uischema)) {
         return false;
     }
     var schemaPath = uischema.scope;
     var currentDataSchema = schema;
     if (hasType(schema, 'object')) {
-        currentDataSchema = resolveSchema(schema, schemaPath, rootSchema);
+        currentDataSchema = resolveSchema(schema, schemaPath, context === null || context === void 0 ? void 0 : context.rootSchema);
     }
     currentDataSchema = get__default["default"](currentDataSchema, subPath);
     if (currentDataSchema === undefined) {
         return false;
     }
-    return predicate(currentDataSchema, rootSchema);
+    return predicate(currentDataSchema, context === null || context === void 0 ? void 0 : context.rootSchema);
 }; };
 var schemaTypeIs = function (expectedType) {
     return schemaMatches(function (schema) { return !isEmpty__default["default"](schema) && hasType(schema, expectedType); });
@@ -871,23 +895,23 @@ var and = function () {
     for (var _i = 0; _i < arguments.length; _i++) {
         testers[_i] = arguments[_i];
     }
-    return function (uischema, schema, rootSchema) { return testers.reduce(function (acc, tester) { return acc && tester(uischema, schema, rootSchema); }, true); };
+    return function (uischema, schema, context) { return testers.reduce(function (acc, tester) { return acc && tester(uischema, schema, context); }, true); };
 };
 var or = function () {
     var testers = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         testers[_i] = arguments[_i];
     }
-    return function (uischema, schema, rootSchema) { return testers.reduce(function (acc, tester) { return acc || tester(uischema, schema, rootSchema); }, false); };
+    return function (uischema, schema, context) { return testers.reduce(function (acc, tester) { return acc || tester(uischema, schema, context); }, false); };
 };
-var rankWith = function (rank, tester) { return function (uischema, schema, rootSchema) {
-    if (tester(uischema, schema, rootSchema)) {
+var rankWith = function (rank, tester) { return function (uischema, schema, context) {
+    if (tester(uischema, schema, context)) {
         return rank;
     }
     return NOT_APPLICABLE;
 }; };
-var withIncreasedRank = function (by, rankedTester) { return function (uischema, schema, rootSchema) {
-    var rank = rankedTester(uischema, schema, rootSchema);
+var withIncreasedRank = function (by, rankedTester) { return function (uischema, schema, context) {
+    var rank = rankedTester(uischema, schema, context);
     if (rank === NOT_APPLICABLE) {
         return NOT_APPLICABLE;
     }
@@ -940,16 +964,14 @@ var traverse = function (any, pred, rootSchema) {
     }
     return false;
 };
-var isObjectArrayWithNesting = function (uischema, schema, rootSchema) {
-    if (!uiTypeIs('Control')(uischema, schema, rootSchema)) {
+var isObjectArrayWithNesting = function (uischema, schema, context) {
+    var _a;
+    if (!uiTypeIs('Control')(uischema, schema, context)) {
         return false;
     }
     var schemaPath = uischema.scope;
-    var resolvedSchema = resolveSchema(schema, schemaPath, rootSchema !== null && rootSchema !== void 0 ? rootSchema : schema);
-    var wantedNestingByType = {
-        object: 2,
-        array: 1
-    };
+    var resolvedSchema = resolveSchema(schema, schemaPath, (_a = context === null || context === void 0 ? void 0 : context.rootSchema) !== null && _a !== void 0 ? _a : schema);
+    var objectDepth = 0;
     if (resolvedSchema !== undefined && resolvedSchema.items !== undefined) {
         if (traverse(resolvedSchema.items, function (val) {
             if (val === schema) {
@@ -958,16 +980,20 @@ var isObjectArrayWithNesting = function (uischema, schema, rootSchema) {
             if (val.$ref !== undefined) {
                 return false;
             }
-            if (typeof val.type !== 'string') {
+            if (val.anyOf || val.oneOf) {
                 return true;
             }
-            var typeCount = wantedNestingByType[val.type];
-            if (typeCount === undefined) {
-                return false;
+            if (hasType(val, 'object')) {
+                objectDepth++;
+                if (objectDepth === 2) {
+                    return true;
+                }
             }
-            wantedNestingByType[val.type] = typeCount - 1;
-            return wantedNestingByType[val.type] === 0;
-        }, rootSchema)) {
+            if (hasType(val, 'array')) {
+                return true;
+            }
+            return false;
+        }, context === null || context === void 0 ? void 0 : context.rootSchema)) {
             return true;
         }
         if (uischema.options && uischema.options.detail) {
@@ -1016,7 +1042,7 @@ var hasCategory = function (categorization) {
 var categorizationHasCategory = function (uischema) {
     return hasCategory(uischema);
 };
-var not = function (tester) { return function (uischema, schema, rootSchema) { return !tester(uischema, schema, rootSchema); }; };
+var not = function (tester) { return function (uischema, schema, context) { return !tester(uischema, schema, context); }; };
 
 var index$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -1181,11 +1207,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/, '~'); };
@@ -1440,12 +1469,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) {
@@ -1753,32 +1782,28 @@ var mapStateToLayoutProps = function (state, ownProps) {
     var config = getConfig(state);
     var enabled = isInherentlyEnabled(state, ownProps, uischema, undefined,
     rootData, config);
+    var t = getTranslator()(state);
+    var label = isLabelable(uischema) ? deriveLabelForUISchemaElement(uischema, t) : undefined;
     return __assign(__assign({}, layoutDefaultProps), { renderers: ownProps.renderers || getRenderers(state), cells: ownProps.cells || getCells(state), visible: visible,
-        enabled: enabled, path: ownProps.path, data: data, uischema: ownProps.uischema, schema: ownProps.schema, direction: (_a = ownProps.direction) !== null && _a !== void 0 ? _a : getDirection(uischema), config: config });
+        enabled: enabled, path: ownProps.path, data: data, uischema: ownProps.uischema, schema: ownProps.schema, direction: (_a = ownProps.direction) !== null && _a !== void 0 ? _a : getDirection(uischema), config: config,
+        label: label });
 };
 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, undefined, undefined, state.jsonforms.core.schema);
-        }
-        else {
-            uischema = getUiSchema(state);
-        }
-    }
     return {
-        renderers: ownProps.renderers || get__default["default"](state.jsonforms, 'renderers') || [],
-        cells: ownProps.cells || get__default["default"](state.jsonforms, 'cells') || [],
+        renderers: ownProps.renderers || get__default["default"](state.jsonforms, 'renderers'),
+        cells: ownProps.cells || get__default["default"](state.jsonforms, 'cells'),
         schema: ownProps.schema || getSchema(state),
         rootSchema: getSchema(state),
-        uischema: uischema,
-        path: ownProps.path
+        uischema: ownProps.uischema || getUiSchema(state),
+        path: ownProps.path,
+        enabled: ownProps.enabled,
+        config: getConfig(state)
     };
 };
 var controlDefaultProps = __assign(__assign({}, layoutDefaultProps), { errors: [] });
 var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
     var _a;
-    var _b = mapStateToControlProps(state, ownProps), data = _b.data, schema = _b.schema, props = __rest(_b, ["data", "schema"]);
+    var _b = mapStateToControlProps(state, ownProps), data = _b.data, schema = _b.schema, rootSchema = _b.rootSchema, props = __rest(_b, ["data", "schema", "rootSchema"]);
     var ajv = state.jsonforms.core.ajv;
     var structuralKeywords = [
         'required',
@@ -1795,7 +1820,11 @@ var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
     var indexOfFittingSchema;
     for (var i = 0; i < ((_a = schema[keyword]) === null || _a === void 0 ? void 0 : _a.length); i++) {
         try {
-            var valFn = ajv.compile(schema[keyword][i]);
+            var _schema = schema[keyword][i];
+            if (_schema.$ref) {
+                _schema = Resolve.schema(rootSchema, _schema.$ref, rootSchema);
+            }
+            var valFn = ajv.compile(_schema);
             valFn(data);
             if (dataIsValid(valFn.errors)) {
                 indexOfFittingSchema = i;
@@ -1807,7 +1836,8 @@ var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
         }
     }
     return __assign(__assign({ data: data,
-        schema: schema }, props), { indexOfFittingSchema: indexOfFittingSchema, uischemas: getUISchemas(state) });
+        schema: schema,
+        rootSchema: rootSchema }, props), { indexOfFittingSchema: indexOfFittingSchema, uischemas: getUISchemas(state) });
 };
 var mapStateToAllOfProps = function (state, ownProps) {
     return mapStateToCombinatorRendererProps(state, ownProps, 'allOf');
@@ -1828,6 +1858,24 @@ var mapStateToArrayLayoutProps = function (state, ownProps) {
     return __assign(__assign({}, props), { path: path,
         uischema: uischema, schema: resolvedSchema, data: props.data ? props.data.length : 0, errors: allErrors, minItems: schema.minItems });
 };
+var mapStateToLabelProps = function (state, props) {
+    var uischema = props.uischema;
+    var visible = props.visible === undefined || hasShowRule(uischema)
+        ? isVisible(props.uischema, getData(state), props.path, getAjv(state))
+        : props.visible;
+    var text = uischema.text;
+    var t = getTranslator()(state);
+    var i18nKeyPrefix = getI18nKeyPrefixBySchema(undefined, uischema);
+    var i18nKey = i18nKeyPrefix ? i18nKeyPrefix + ".text" : text !== null && text !== void 0 ? text : '';
+    var i18nText = t(i18nKey, text, { uischema: uischema });
+    return {
+        text: i18nText,
+        visible: visible,
+        config: getConfig(state),
+        renderers: props.renderers || getRenderers(state),
+        cells: props.cells || getCells(state),
+    };
+};
 
 var mapStateToCellProps = function (state, ownProps) {
     var id = ownProps.id, schema = ownProps.schema, path = ownProps.path, uischema = ownProps.uischema, renderers = ownProps.renderers, cells = ownProps.cells;
@@ -2315,6 +2363,7 @@ exports.defaultJsonFormsI18nState = defaultJsonFormsI18nState;
 exports.defaultMapDispatchToControlProps = defaultMapDispatchToControlProps;
 exports.defaultMapStateToEnumCellProps = defaultMapStateToEnumCellProps;
 exports.defaultTranslator = defaultTranslator;
+exports.deriveLabelForUISchemaElement = deriveLabelForUISchemaElement;
 exports.deriveTypes = deriveTypes;
 exports.encode = encode;
 exports.enumToEnumOptionMapper = enumToEnumOptionMapper;
@@ -2379,6 +2428,8 @@ 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;
@@ -2391,6 +2442,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;
@@ -2412,6 +2465,7 @@ exports.mapStateToControlWithDetailProps = mapStateToControlWithDetailProps;
 exports.mapStateToDispatchCellProps = mapStateToDispatchCellProps;
 exports.mapStateToEnumControlProps = mapStateToEnumControlProps;
 exports.mapStateToJsonFormsRendererProps = mapStateToJsonFormsRendererProps;
+exports.mapStateToLabelProps = mapStateToLabelProps;
 exports.mapStateToLayoutProps = mapStateToLayoutProps;
 exports.mapStateToMasterListItemProps = mapStateToMasterListItemProps;
 exports.mapStateToMultiEnumControlProps = mapStateToMultiEnumControlProps;