@jsonforms/core 3.1.0-alpha.0 → 3.1.0-alpha.2

package/src/util/cell.ts

@@ -24,9 +24,8 @@
 */
 
 import isEmpty from 'lodash/isEmpty';
-import union from 'lodash/union';
-import type { JsonFormsCellRendererRegistryEntry } from '../reducers';
 import {
+  getErrorTranslator,
   getAjv,
   getConfig,
   getData,
@@ -34,15 +33,10 @@ import {
   getSchema,
   getTranslator,
 } from '../reducers';
-import { AnyAction, Dispatch } from './type';
-import {
-  formatErrorMessage,
-  Resolve,
-} from './util';
-import {
-  isInherentlyEnabled,
-  isVisible,
-} from './runtime';
+import type { JsonFormsCellRendererRegistryEntry } from '../reducers';
+import type { AnyAction, Dispatch } from './type';
+import { Resolve } from './util';
+import { isInherentlyEnabled, isVisible } from './runtime';
 import {
   DispatchPropsOfControl,
   EnumOption,
@@ -53,11 +47,9 @@ import {
   OwnPropsOfEnum,
   StatePropsOfScopedRenderer,
 } from './renderer';
-import { JsonFormsState } from '../store';
-import { JsonSchema } from '../models';
-import { getI18nKeyPrefix } from '../i18n';
-
-export type { JsonFormsCellRendererRegistryEntry };
+import { getCombinedErrorMessage, getI18nKeyPrefix } from '../i18n';
+import type { JsonFormsState } from '../store';
+import type { JsonSchema } from '../models';
 
 export interface OwnPropsOfCell extends OwnPropsOfControl {
   data?: any;
@@ -126,7 +118,7 @@ export const mapStateToCellProps = (
 
   /* When determining the enabled state of cells we take a shortcut: At the
    * moment it's only possible to configure enablement and disablement at the
-   * control level. Therefore the renderer using the cell, for example a 
+   * control level. Therefore the renderer using the cell, for example a
    * table renderer, determines whether a cell is enabled and should hand
    * over the prop themselves. If that prop was given, we prefer it over
    * anything else to save evaluation effort (except for the global readonly
@@ -148,8 +140,15 @@ export const mapStateToCellProps = (
     );
   }
 
-  const errors = formatErrorMessage(
-    union(getErrorAt(path, schema)(state).map(error => error.message))
+  const t = getTranslator()(state);
+  const te = getErrorTranslator()(state);
+  const errors = getCombinedErrorMessage(
+    getErrorAt(path, schema)(state),
+    te,
+    t,
+    schema,
+    uischema,
+    path
   );
   const isValid = isEmpty(errors);
 
@@ -166,7 +165,7 @@ export const mapStateToCellProps = (
     config: getConfig(state),
     rootSchema,
     renderers,
-    cells
+    cells,
   };
 };
 
@@ -175,11 +174,11 @@ export const mapStateToDispatchCellProps = (
   ownProps: OwnPropsOfCell
 ): DispatchCellStateProps => {
   const props: StatePropsOfCell = mapStateToCellProps(state, ownProps);
-  const { renderers, cells, ...otherOwnProps } = ownProps;
+  const { renderers: _renderers, cells, ...otherOwnProps } = ownProps;
   return {
     ...props,
     ...otherOwnProps,
-    cells: cells || state.jsonforms.cells || []
+    cells: cells || state.jsonforms.cells || [],
   };
 };
 
@@ -198,7 +197,7 @@ export const defaultMapStateToEnumCellProps = (
   const props: StatePropsOfCell = mapStateToCellProps(state, ownProps);
   const options: EnumOption[] =
     ownProps.options ||
-    props.schema.enum?.map(e =>
+    props.schema.enum?.map((e) =>
       enumToEnumOptionMapper(
         e,
         getTranslator()(state),
@@ -210,11 +209,11 @@ export const defaultMapStateToEnumCellProps = (
         props.schema.const,
         getTranslator()(state),
         getI18nKeyPrefix(props.schema, props.uischema, props.path)
-      )
+      ),
     ]);
   return {
     ...props,
-    options
+    options,
   };
 };
 
@@ -231,7 +230,7 @@ export const mapStateToOneOfEnumCellProps = (
   const props: StatePropsOfCell = mapStateToCellProps(state, ownProps);
   const options: EnumOption[] =
     ownProps.options ||
-    (props.schema.oneOf as JsonSchema[])?.map(oneOfSubSchema =>
+    (props.schema.oneOf as JsonSchema[])?.map((oneOfSubSchema) =>
       oneOfToEnumOptionMapper(
         oneOfSubSchema,
         getTranslator()(state),
@@ -240,11 +239,10 @@ export const mapStateToOneOfEnumCellProps = (
     );
   return {
     ...props,
-    options
+    options,
   };
 };
 
-
 /**
  * Synonym for mapDispatchToControlProps.
  *
@@ -264,6 +262,6 @@ export const defaultMapDispatchToControlProps =
     const { handleChange } = mapDispatchToCellProps(dispatch);
 
     return {
-      handleChange: ownProps.handleChange || handleChange
+      handleChange: ownProps.handleChange || handleChange,
     };
   };

package/src/util/combinators.ts

@@ -23,7 +23,7 @@
   THE SOFTWARE.
 */
 
-import { ControlElement, JsonSchema, UISchemaElement } from '../models';
+import type { ControlElement, JsonSchema, UISchemaElement } from '../models';
 import { findUISchema, JsonFormsUISchemaRegistryEntry } from '../reducers';
 import { Resolve } from './util';
 
@@ -56,7 +56,9 @@ export const createCombinatorRenderInfos = (
   uischemas: JsonFormsUISchemaRegistryEntry[]
 ): CombinatorSubSchemaRenderInfo[] =>
   combinatorSubSchemas.map((subSchema, subSchemaIndex) => {
-    const schema = subSchema.$ref ? Resolve.schema(rootSchema, subSchema.$ref, rootSchema) : subSchema;
+    const schema = subSchema.$ref
+      ? Resolve.schema(rootSchema, subSchema.$ref, rootSchema)
+      : subSchema;
     return {
       schema,
       uischema: findUISchema(
@@ -68,6 +70,6 @@ export const createCombinatorRenderInfos = (
         control,
         rootSchema
       ),
-      label: createLabel(subSchema, subSchemaIndex, keyword)
-    }
+      label: createLabel(subSchema, subSchemaIndex, keyword),
+    };
   });

package/src/util/label.ts

@@ -25,7 +25,7 @@
 
 import startCase from 'lodash/startCase';
 
-import { ControlElement, JsonSchema, LabelDescription } from '../models';
+import type { ControlElement, JsonSchema, LabelDescription } from '../models';
 import { decode } from './path';
 
 const deriveLabel = (
@@ -79,5 +79,5 @@ export const createLabelDescriptionFrom = (
 
 const labelDescription = (text: string, show: boolean): LabelDescription => ({
   text: text,
-  show: show
+  show: show,
 });

package/src/util/path.ts

@@ -65,20 +65,25 @@ export const toDataPathSegments = (schemaPath: string): string[] => {
 
   const startFromRoot = decodedSegments[0] === '#' || decodedSegments[0] === '';
   const startIndex = startFromRoot ? 2 : 1;
-  return range(startIndex, decodedSegments.length, 2).map(idx => decodedSegments[idx]);
+  return range(startIndex, decodedSegments.length, 2).map(
+    (idx) => decodedSegments[idx]
+  );
 };
 
 /**
- * Remove all schema-specific keywords (e.g. 'properties') from a given path.
+ * Convert a schema path (i.e. JSON pointer) to a data path.
+ *
+ * Data paths can be used in field change event handlers like handleChange.
+ *
  * @example
- * toDataPath('#/properties/foo/properties/bar') === '#/foo/bar')
+ * toDataPath('#/properties/foo/properties/bar') === 'foo.bar')
  *
  * @param {string} schemaPath the schema path to be converted
- * @returns {string} the path without schema-specific keywords
+ * @returns {string} the data path
  */
 export const toDataPath = (schemaPath: string): string => {
   return toDataPathSegments(schemaPath).join('.');
-    };
+};
 
 export const composeWithUi = (scopableUi: Scopable, path: string): string => {
   if (!isScoped(scopableUi)) {
@@ -96,11 +101,13 @@ export const composeWithUi = (scopableUi: Scopable, path: string): string => {
 
 /**
  * Encodes the given segment to be used as part of a JSON Pointer
- * 
+ *
  * JSON Pointer has special meaning for "/" and "~", therefore these must be encoded
  */
-export const encode = (segment: string) => segment?.replace(/~/g, '~0').replace(/\//g, '~1');
+export const encode = (segment: string) =>
+  segment?.replace(/~/g, '~0').replace(/\//g, '~1');
 /**
  * Decodes a given JSON Pointer segment to its "normal" representation
  */
-export const decode = (pointerSegment: string) => pointerSegment?.replace(/~1/g, '/').replace(/~0/, '~');
+export const decode = (pointerSegment: string) =>
+  pointerSegment?.replace(/~1/g, '/').replace(/~0/, '~');