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

package/lib/jsonforms-core.esm.js

@@ -292,11 +292,13 @@ var RuleEffect;
     RuleEffect["ENABLE"] = "ENABLE";
     RuleEffect["DISABLE"] = "DISABLE";
 })(RuleEffect || (RuleEffect = {}));
-const isInternationalized = (element) => {
-    return typeof element === 'object' && element !== null && typeof element.i18n === 'string';
-};
+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', 'boolean'].includes(typeof obj.label);
 
 const move = (array, index, delta) => {
     const newIndex = index + delta;
@@ -686,6 +688,18 @@ const getCombinedErrorMessage = (errors, et, t, schema, uischema, path) => {
     }
     return formatErrorMessage(errors.map(error => et(error, t, uischema)));
 };
+const deriveLabelForUISchemaElement = (uischema, t) => {
+    if (uischema.label === false) {
+        return undefined;
+    }
+    if ((uischema.label === undefined || uischema.label === null || uischema.label === true) && !isInternationalized(uischema)) {
+        return undefined;
+    }
+    const stringifiedLabel = typeof uischema.label === 'string' ? uischema.label : JSON.stringify(uischema.label);
+    const i18nKeyPrefix = getI18nKeyPrefixBySchema(undefined, uischema);
+    const i18nKey = typeof i18nKeyPrefix === 'string' ? `${i18nKeyPrefix}.label` : stringifiedLabel;
+    return t(i18nKey, stringifiedLabel, { uischema: uischema });
+};
 
 const defaultJsonFormsI18nState = {
     locale: 'en',
@@ -759,7 +773,7 @@ const rendererReducer = (state = [], action) => {
 
 const NOT_APPLICABLE = -1;
 const isControl = (uischema) => !isEmpty(uischema) && uischema.scope !== undefined;
-const schemaMatches = (predicate) => (uischema, schema, rootSchema) => {
+const schemaMatches = (predicate) => (uischema, schema, context) => {
     if (isEmpty(uischema) || !isControl(uischema)) {
         return false;
     }
@@ -772,27 +786,27 @@ const schemaMatches = (predicate) => (uischema, schema, rootSchema) => {
     }
     let currentDataSchema = schema;
     if (hasType(schema, 'object')) {
-        currentDataSchema = resolveSchema(schema, schemaPath, rootSchema);
+        currentDataSchema = resolveSchema(schema, schemaPath, context?.rootSchema);
     }
     if (currentDataSchema === undefined) {
         return false;
     }
-    return predicate(currentDataSchema, rootSchema);
+    return predicate(currentDataSchema, context?.rootSchema);
 };
-const schemaSubPathMatches = (subPath, predicate) => (uischema, schema, rootSchema) => {
+const schemaSubPathMatches = (subPath, predicate) => (uischema, schema, context) => {
     if (isEmpty(uischema) || !isControl(uischema)) {
         return false;
     }
     const schemaPath = uischema.scope;
     let currentDataSchema = schema;
     if (hasType(schema, 'object')) {
-        currentDataSchema = resolveSchema(schema, schemaPath, rootSchema);
+        currentDataSchema = resolveSchema(schema, schemaPath, context?.rootSchema);
     }
     currentDataSchema = get(currentDataSchema, subPath);
     if (currentDataSchema === undefined) {
         return false;
     }
-    return predicate(currentDataSchema, rootSchema);
+    return predicate(currentDataSchema, context?.rootSchema);
 };
 const schemaTypeIs = (expectedType) => schemaMatches(schema => !isEmpty(schema) && hasType(schema, expectedType));
 const formatIs = (expectedFormat) => schemaMatches(schema => !isEmpty(schema) &&
@@ -819,16 +833,16 @@ const scopeEndIs = (expected) => (uischema) => {
     const schemaPath = uischema.scope;
     return !isEmpty(schemaPath) && last(schemaPath.split('/')) === expected;
 };
-const and = (...testers) => (uischema, schema, rootSchema) => testers.reduce((acc, tester) => acc && tester(uischema, schema, rootSchema), true);
-const or = (...testers) => (uischema, schema, rootSchema) => testers.reduce((acc, tester) => acc || tester(uischema, schema, rootSchema), false);
-const rankWith = (rank, tester) => (uischema, schema, rootSchema) => {
-    if (tester(uischema, schema, rootSchema)) {
+const and = (...testers) => (uischema, schema, context) => testers.reduce((acc, tester) => acc && tester(uischema, schema, context), true);
+const or = (...testers) => (uischema, schema, context) => testers.reduce((acc, tester) => acc || tester(uischema, schema, context), false);
+const rankWith = (rank, tester) => (uischema, schema, context) => {
+    if (tester(uischema, schema, context)) {
         return rank;
     }
     return NOT_APPLICABLE;
 };
-const withIncreasedRank = (by, rankedTester) => (uischema, schema, rootSchema) => {
-    const rank = rankedTester(uischema, schema, rootSchema);
+const withIncreasedRank = (by, rankedTester) => (uischema, schema, context) => {
+    const rank = rankedTester(uischema, schema, context);
     if (rank === NOT_APPLICABLE) {
         return NOT_APPLICABLE;
     }
@@ -876,16 +890,13 @@ const traverse = (any, pred, rootSchema) => {
     }
     return false;
 };
-const isObjectArrayWithNesting = (uischema, schema, rootSchema) => {
-    if (!uiTypeIs('Control')(uischema, schema, rootSchema)) {
+const isObjectArrayWithNesting = (uischema, schema, context) => {
+    if (!uiTypeIs('Control')(uischema, schema, context)) {
         return false;
     }
     const schemaPath = uischema.scope;
-    const resolvedSchema = resolveSchema(schema, schemaPath, rootSchema ?? schema);
-    const wantedNestingByType = {
-        object: 2,
-        array: 1
-    };
+    const resolvedSchema = resolveSchema(schema, schemaPath, context?.rootSchema ?? schema);
+    let objectDepth = 0;
     if (resolvedSchema !== undefined && resolvedSchema.items !== undefined) {
         if (traverse(resolvedSchema.items, val => {
             if (val === schema) {
@@ -894,16 +905,20 @@ const isObjectArrayWithNesting = (uischema, schema, rootSchema) => {
             if (val.$ref !== undefined) {
                 return false;
             }
-            if (typeof val.type !== 'string') {
+            if (val.anyOf || val.oneOf) {
                 return true;
             }
-            const typeCount = wantedNestingByType[val.type];
-            if (typeCount === undefined) {
-                return false;
+            if (hasType(val, 'object')) {
+                objectDepth++;
+                if (objectDepth === 2) {
+                    return true;
+                }
+            }
+            if (hasType(val, 'array')) {
+                return true;
             }
-            wantedNestingByType[val.type] = typeCount - 1;
-            return wantedNestingByType[val.type] === 0;
-        }, rootSchema)) {
+            return false;
+        }, context?.rootSchema)) {
             return true;
         }
         if (uischema.options && uischema.options.detail) {
@@ -942,7 +957,7 @@ const hasCategory = (categorization) => {
         .reduce((prev, curr) => prev && curr, true);
 };
 const categorizationHasCategory = (uischema) => hasCategory(uischema);
-const not = (tester) => (uischema, schema, rootSchema) => !tester(uischema, schema, rootSchema);
+const not = (tester) => (uischema, schema, context) => !tester(uischema, schema, context);
 
 var index$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -1093,11 +1108,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/, '~');
@@ -1331,10 +1349,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) {
@@ -1650,6 +1668,8 @@ const mapStateToLayoutProps = (state, ownProps) => {
     const config = getConfig(state);
     const enabled = isInherentlyEnabled(state, ownProps, uischema, undefined,
     rootData, config);
+    const t = getTranslator()(state);
+    const label = isLabelable(uischema) ? deriveLabelForUISchemaElement(uischema, t) : undefined;
     return {
         ...layoutDefaultProps,
         renderers: ownProps.renderers || getRenderers(state),
@@ -1661,26 +1681,20 @@ const mapStateToLayoutProps = (state, ownProps) => {
         uischema: ownProps.uischema,
         schema: ownProps.schema,
         direction: ownProps.direction ?? getDirection(uischema),
-        config
+        config,
+        label
     };
 };
 const mapStateToJsonFormsRendererProps = (state, ownProps) => {
-    let 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(state.jsonforms, 'renderers') || [],
-        cells: ownProps.cells || get(state.jsonforms, 'cells') || [],
+        renderers: ownProps.renderers || get(state.jsonforms, 'renderers'),
+        cells: ownProps.cells || get(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)
     };
 };
 const controlDefaultProps = {
@@ -1688,7 +1702,7 @@ const controlDefaultProps = {
     errors: []
 };
 const mapStateToCombinatorRendererProps = (state, ownProps, keyword) => {
-    const { data, schema, ...props } = mapStateToControlProps(state, ownProps);
+    const { data, schema, rootSchema, ...props } = mapStateToControlProps(state, ownProps);
     const ajv = state.jsonforms.core.ajv;
     const structuralKeywords = [
         'required',
@@ -1705,7 +1719,11 @@ const mapStateToCombinatorRendererProps = (state, ownProps, keyword) => {
     let indexOfFittingSchema;
     for (let i = 0; i < schema[keyword]?.length; i++) {
         try {
-            const valFn = ajv.compile(schema[keyword][i]);
+            let _schema = schema[keyword][i];
+            if (_schema.$ref) {
+                _schema = Resolve.schema(rootSchema, _schema.$ref, rootSchema);
+            }
+            const valFn = ajv.compile(_schema);
             valFn(data);
             if (dataIsValid(valFn.errors)) {
                 indexOfFittingSchema = i;
@@ -1719,6 +1737,7 @@ const mapStateToCombinatorRendererProps = (state, ownProps, keyword) => {
     return {
         data,
         schema,
+        rootSchema,
         ...props,
         indexOfFittingSchema,
         uischemas: getUISchemas(state)
@@ -1748,6 +1767,24 @@ const mapStateToArrayLayoutProps = (state, ownProps) => {
         minItems: schema.minItems
     };
 };
+const mapStateToLabelProps = (state, props) => {
+    const { uischema } = props;
+    const visible = props.visible === undefined || hasShowRule(uischema)
+        ? isVisible(props.uischema, getData(state), props.path, getAjv(state))
+        : props.visible;
+    const text = uischema.text;
+    const t = getTranslator()(state);
+    const i18nKeyPrefix = getI18nKeyPrefixBySchema(undefined, uischema);
+    const i18nKey = i18nKeyPrefix ? `${i18nKeyPrefix}.text` : text ?? '';
+    const i18nText = t(i18nKey, text, { uischema });
+    return {
+        text: i18nText,
+        visible,
+        config: getConfig(state),
+        renderers: props.renderers || getRenderers(state),
+        cells: props.cells || getCells(state),
+    };
+};
 
 const mapStateToCellProps = (state, ownProps) => {
     const { id, schema, path, uischema, renderers, cells } = ownProps;
@@ -2176,5 +2213,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, isInternationalized, 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, deriveLabelForUISchemaElement, 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, mapStateToLabelProps, 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