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

package/src/testers/testers.ts

@@ -35,7 +35,7 @@ import type {
   Categorization,
   ControlElement,
   JsonSchema,
-  UISchemaElement
+  UISchemaElement,
 } from '../models';
 import { deriveTypes, hasType, resolveSchema } from '../util';
 
@@ -49,7 +49,11 @@ export const NOT_APPLICABLE = -1;
  * A tester is a function that receives an UI schema and a JSON schema and returns a boolean.
  * The rootSchema is handed over as context. Can be used to resolve references.
  */
-export type Tester = (uischema: UISchemaElement, schema: JsonSchema, context: TesterContext) => boolean;
+export type Tester = (
+  uischema: UISchemaElement,
+  schema: JsonSchema,
+  context: TesterContext
+) => boolean;
 
 /**
  * A ranked tester associates a tester with a number.
@@ -83,50 +87,70 @@ export const isControl = (uischema: any): uischema is ControlElement =>
  * @param {(JsonSchema) => boolean} predicate the predicate that should be
  *        applied to the resolved sub-schema
  */
-export const schemaMatches = (
-  predicate: (schema: JsonSchema, rootSchema: JsonSchema) => boolean
-): Tester => (uischema: UISchemaElement, schema: JsonSchema, context: TesterContext): boolean => {
-  if (isEmpty(uischema) || !isControl(uischema)) {
-    return false;
-  }
-  if (isEmpty(schema)) {
-    return false;
-  }
-  const schemaPath = uischema.scope;
-  if (isEmpty(schemaPath)) {
-    return false;
-  }
-  let currentDataSchema = schema;
-  if (hasType(schema, 'object')) {
-    currentDataSchema = resolveSchema(schema, schemaPath, context?.rootSchema);
-  }
-  if (currentDataSchema === undefined) {
-    return false;
-  }
-
-  return predicate(currentDataSchema, context?.rootSchema);
-};
+export const schemaMatches =
+  (
+    predicate: (schema: JsonSchema, rootSchema: JsonSchema) => boolean
+  ): Tester =>
+  (
+    uischema: UISchemaElement,
+    schema: JsonSchema,
+    context: TesterContext
+  ): boolean => {
+    if (isEmpty(uischema) || !isControl(uischema)) {
+      return false;
+    }
+    if (isEmpty(schema)) {
+      return false;
+    }
+    const schemaPath = uischema.scope;
+    if (isEmpty(schemaPath)) {
+      return false;
+    }
+    let currentDataSchema = schema;
+    if (hasType(schema, 'object')) {
+      currentDataSchema = resolveSchema(
+        schema,
+        schemaPath,
+        context?.rootSchema
+      );
+    }
+    if (currentDataSchema === undefined) {
+      return false;
+    }
 
-export const schemaSubPathMatches = (
-  subPath: string,
-  predicate: (schema: JsonSchema, rootSchema: JsonSchema) => boolean
-): Tester => (uischema: UISchemaElement, schema: JsonSchema, context: TesterContext): boolean => {
-  if (isEmpty(uischema) || !isControl(uischema)) {
-    return false;
-  }
-  const schemaPath = uischema.scope;
-  let currentDataSchema: JsonSchema = schema;
-  if (hasType(schema, 'object')) {
-    currentDataSchema = resolveSchema(schema, schemaPath, context?.rootSchema);
-  }
-  currentDataSchema = get(currentDataSchema, subPath);
+    return predicate(currentDataSchema, context?.rootSchema);
+  };
+
+export const schemaSubPathMatches =
+  (
+    subPath: string,
+    predicate: (schema: JsonSchema, rootSchema: JsonSchema) => boolean
+  ): Tester =>
+  (
+    uischema: UISchemaElement,
+    schema: JsonSchema,
+    context: TesterContext
+  ): boolean => {
+    if (isEmpty(uischema) || !isControl(uischema)) {
+      return false;
+    }
+    const schemaPath = uischema.scope;
+    let currentDataSchema: JsonSchema = schema;
+    if (hasType(schema, 'object')) {
+      currentDataSchema = resolveSchema(
+        schema,
+        schemaPath,
+        context?.rootSchema
+      );
+    }
+    currentDataSchema = get(currentDataSchema, subPath);
 
-  if (currentDataSchema === undefined) {
-    return false;
-  }
+    if (currentDataSchema === undefined) {
+      return false;
+    }
 
-  return predicate(currentDataSchema, context?.rootSchema);
-};
+    return predicate(currentDataSchema, context?.rootSchema);
+  };
 
 /**
  * Only applicable for Controls.
@@ -138,7 +162,7 @@ export const schemaSubPathMatches = (
  * @param {string} expectedType the expected type of the resolved sub-schema
  */
 export const schemaTypeIs = (expectedType: string): Tester =>
-  schemaMatches(schema => !isEmpty(schema) && hasType(schema, expectedType));
+  schemaMatches((schema) => !isEmpty(schema) && hasType(schema, expectedType));
 
 /**
  * Only applicable for Controls.
@@ -151,7 +175,7 @@ export const schemaTypeIs = (expectedType: string): Tester =>
  */
 export const formatIs = (expectedFormat: string): Tester =>
   schemaMatches(
-    schema =>
+    (schema) =>
       !isEmpty(schema) &&
       schema.format === expectedFormat &&
       hasType(schema, 'string')
@@ -162,9 +186,10 @@ export const formatIs = (expectedFormat: string): Tester =>
  *
  * @param {string} expected the expected UI schema type
  */
-export const uiTypeIs = (expected: string): Tester => (
-  uischema: UISchemaElement
-): boolean => !isEmpty(uischema) && uischema.type === expected;
+export const uiTypeIs =
+  (expected: string): Tester =>
+  (uischema: UISchemaElement): boolean =>
+    !isEmpty(uischema) && uischema.type === expected;
 
 /**
  * Checks whether the given UI schema has an option with the given
@@ -174,16 +199,16 @@ export const uiTypeIs = (expected: string): Tester => (
  * @param {string} optionName the name of the option to check
  * @param {any} optionValue the expected value of the option
  */
-export const optionIs = (optionName: string, optionValue: any): Tester => (
-  uischema: UISchemaElement
-): boolean => {
-  if (isEmpty(uischema)) {
-    return false;
-  }
+export const optionIs =
+  (optionName: string, optionValue: any): Tester =>
+  (uischema: UISchemaElement): boolean => {
+    if (isEmpty(uischema)) {
+      return false;
+    }
 
-  const options = uischema.options;
-  return !isEmpty(options) && options[optionName] === optionValue;
-};
+    const options = uischema.options;
+    return !isEmpty(options) && options[optionName] === optionValue;
+  };
 
 /**
  * Only applicable for Controls.
@@ -192,15 +217,15 @@ export const optionIs = (optionName: string, optionValue: any): Tester => (
  *
  * @param {string} expected the expected ending of the reference
  */
-export const scopeEndsWith = (expected: string): Tester => (
-  uischema: UISchemaElement
-): boolean => {
-  if (isEmpty(expected) || !isControl(uischema)) {
-    return false;
-  }
+export const scopeEndsWith =
+  (expected: string): Tester =>
+  (uischema: UISchemaElement): boolean => {
+    if (isEmpty(expected) || !isControl(uischema)) {
+      return false;
+    }
 
-  return endsWith(uischema.scope, expected);
-};
+    return endsWith(uischema.scope, expected);
+  };
 
 /**
  * Only applicable for Controls.
@@ -209,38 +234,42 @@ export const scopeEndsWith = (expected: string): Tester => (
  *
  * @param {string} expected the expected ending of the reference
  */
-export const scopeEndIs = (expected: string): Tester => (
-  uischema: UISchemaElement
-): boolean => {
-  if (isEmpty(expected) || !isControl(uischema)) {
-    return false;
-  }
-  const schemaPath = uischema.scope;
+export const scopeEndIs =
+  (expected: string): Tester =>
+  (uischema: UISchemaElement): boolean => {
+    if (isEmpty(expected) || !isControl(uischema)) {
+      return false;
+    }
+    const schemaPath = uischema.scope;
 
-  return !isEmpty(schemaPath) && last(schemaPath.split('/')) === expected;
-};
+    return !isEmpty(schemaPath) && last(schemaPath.split('/')) === expected;
+  };
 
 /**
  * A tester that allow composing other testers by && them.
  *
  * @param {Array<Tester>} testers the testers to be composed
  */
-export const and = (...testers: Tester[]): Tester => (
-  uischema: UISchemaElement,
-  schema: JsonSchema,
-  context: TesterContext
-) => testers.reduce((acc, tester) => acc && tester(uischema, schema, context), true);
+export const and =
+  (...testers: Tester[]): Tester =>
+  (uischema: UISchemaElement, schema: JsonSchema, context: TesterContext) =>
+    testers.reduce(
+      (acc, tester) => acc && tester(uischema, schema, context),
+      true
+    );
 
 /**
  * A tester that allow composing other testers by || them.
  *
  * @param {Array<Tester>} testers the testers to be composed
  */
-export const or = (...testers: Tester[]): Tester => (
-  uischema: UISchemaElement,
-  schema: JsonSchema,
-  context: TesterContext
-) => testers.reduce((acc, tester) => acc || tester(uischema, schema, context), false);
+export const or =
+  (...testers: Tester[]): Tester =>
+  (uischema: UISchemaElement, schema: JsonSchema, context: TesterContext) =>
+    testers.reduce(
+      (acc, tester) => acc || tester(uischema, schema, context),
+      false
+    );
 /**
  * Create a ranked tester that will associate a number with a given tester, if the
  * latter returns true.
@@ -248,30 +277,34 @@ export const or = (...testers: Tester[]): Tester => (
  * @param {number} rank the rank to be returned in case the tester returns true
  * @param {Tester} tester a tester
  */
-export const rankWith = (rank: number, tester: Tester) => (
-  uischema: UISchemaElement,
-  schema: JsonSchema,
-  context: TesterContext
-): number => {
-  if (tester(uischema, schema, context)) {
-    return rank;
-  }
-
-  return NOT_APPLICABLE;
-};
+export const rankWith =
+  (rank: number, tester: Tester) =>
+  (
+    uischema: UISchemaElement,
+    schema: JsonSchema,
+    context: TesterContext
+  ): number => {
+    if (tester(uischema, schema, context)) {
+      return rank;
+    }
 
-export const withIncreasedRank = (by: number, rankedTester: RankedTester) => (
-  uischema: UISchemaElement,
-  schema: JsonSchema,
-  context: TesterContext
-): number => {
-  const rank = rankedTester(uischema, schema, context);
-  if (rank === NOT_APPLICABLE) {
     return NOT_APPLICABLE;
-  }
+  };
+
+export const withIncreasedRank =
+  (by: number, rankedTester: RankedTester) =>
+  (
+    uischema: UISchemaElement,
+    schema: JsonSchema,
+    context: TesterContext
+  ): number => {
+    const rank = rankedTester(uischema, schema, context);
+    if (rank === NOT_APPLICABLE) {
+      return NOT_APPLICABLE;
+    }
 
-  return rank + by;
-};
+    return rank + by;
+  };
 
 /**
  * Default tester for boolean.
@@ -287,17 +320,17 @@ export const isObjectControl = and(uiTypeIs('Control'), schemaTypeIs('object'));
 
 export const isAllOfControl = and(
   uiTypeIs('Control'),
-  schemaMatches(schema => schema.hasOwnProperty('allOf'))
+  schemaMatches((schema) => schema.hasOwnProperty('allOf'))
 );
 
 export const isAnyOfControl = and(
   uiTypeIs('Control'),
-  schemaMatches(schema => schema.hasOwnProperty('anyOf'))
+  schemaMatches((schema) => schema.hasOwnProperty('anyOf'))
 );
 
 export const isOneOfControl = and(
   uiTypeIs('Control'),
-  schemaMatches(schema => schema.hasOwnProperty('oneOf'))
+  schemaMatches((schema) => schema.hasOwnProperty('oneOf'))
 );
 
 /**
@@ -308,8 +341,8 @@ export const isOneOfControl = and(
 export const isEnumControl = and(
   uiTypeIs('Control'),
   or(
-    schemaMatches(schema => schema.hasOwnProperty('enum')),
-    schemaMatches(schema => schema.hasOwnProperty('const'))
+    schemaMatches((schema) => schema.hasOwnProperty('enum')),
+    schemaMatches((schema) => schema.hasOwnProperty('const'))
   )
 );
 
@@ -320,9 +353,10 @@ export const isEnumControl = and(
  */
 export const isOneOfEnumControl = and(
   uiTypeIs('Control'),
-  schemaMatches(schema =>
-    schema.hasOwnProperty('oneOf') &&
-    (schema.oneOf as JsonSchema[]).every(s => s.const !== undefined)
+  schemaMatches(
+    (schema) =>
+      schema.hasOwnProperty('oneOf') &&
+      (schema.oneOf as JsonSchema[]).every((s) => s.const !== undefined)
   )
 );
 
@@ -396,11 +430,15 @@ export const isDateTimeControl = and(
  */
 export const isObjectArray = and(
   schemaMatches(
-    (schema, rootSchema) => hasType(schema, 'array') && !Array.isArray(resolveSchema(schema, 'items', rootSchema)) // we don't care about tuples
+    (schema, rootSchema) =>
+      hasType(schema, 'array') &&
+      !Array.isArray(resolveSchema(schema, 'items', rootSchema)) // we don't care about tuples
   ),
   schemaSubPathMatches('items', (schema, rootSchema) => {
-    const resolvedSchema = schema.$ref ? resolveSchema(rootSchema, schema.$ref, rootSchema) : schema;
-    return hasType(resolvedSchema, 'object')
+    const resolvedSchema = schema.$ref
+      ? resolveSchema(rootSchema, schema.$ref, rootSchema)
+      : schema;
+    return hasType(resolvedSchema, 'object');
   })
 );
 
@@ -417,7 +455,11 @@ const traverse = (
   rootSchema: JsonSchema
 ): boolean => {
   if (isArray(any)) {
-    return reduce(any, (acc, el) => acc || traverse(el, pred, rootSchema), false);
+    return reduce(
+      any,
+      (acc, el) => acc || traverse(el, pred, rootSchema),
+      false
+    );
   }
 
   if (pred(any)) {
@@ -454,32 +496,43 @@ export const isObjectArrayWithNesting = (
     return false;
   }
   const schemaPath = (uischema as ControlElement).scope;
-  const resolvedSchema = resolveSchema(schema, schemaPath, context?.rootSchema ?? schema);
+  const resolvedSchema = resolveSchema(
+    schema,
+    schemaPath,
+    context?.rootSchema ?? schema
+  );
   let objectDepth = 0;
   if (resolvedSchema !== undefined && resolvedSchema.items !== undefined) {
     // check if nested arrays
     if (
-      traverse(resolvedSchema.items, val => {
-        if (val === schema) {
-          return false;
-        }
-        if (val.$ref !== undefined) {
-          return false;
-        }
-        if (val.anyOf || val.oneOf || val.allOf) {
-          return true;
-        }
-        if (hasType(val, 'object')) {
-          objectDepth++;
-          if (objectDepth === 2) {
+      traverse(
+        resolvedSchema.items,
+        (val) => {
+          if (val === schema) {
+            return false;
+          }
+          if (val.$ref !== undefined) {
+            return false;
+          }
+          if (val.anyOf || val.allOf) {
             return true;
           }
-        }
-        if (hasType(val, 'array')) {
-          return true;
-        }
-        return false;
-      }, context?.rootSchema)
+          if (val.oneOf && !isOneOfEnumControl(uischema, val, context)) {
+            return true;
+          }
+          if (hasType(val, 'object')) {
+            objectDepth++;
+            if (objectDepth === 2) {
+              return true;
+            }
+          }
+          if (hasType(val, 'array')) {
+            return true;
+          }
+          return false;
+        },
+        context?.rootSchema
+      )
     ) {
       return true;
     }
@@ -516,7 +569,9 @@ export const isPrimitiveArrayControl = and(
       !Array.isArray(resolveSchema(schema, 'items', rootSchema)) // we don't care about tuples
   ),
   schemaSubPathMatches('items', (schema, rootSchema) => {
-    const resolvedSchema = schema.$ref ? resolveSchema(rootSchema, schema.$ref, rootSchema) : schema;
+    const resolvedSchema = schema.$ref
+      ? resolveSchema(rootSchema, schema.$ref, rootSchema)
+      : schema;
     const types = deriveTypes(resolvedSchema);
     return (
       types.length === 1 &&
@@ -535,7 +590,7 @@ export const isRangeControl = and(
   uiTypeIs('Control'),
   or(schemaTypeIs('number'), schemaTypeIs('integer')),
   schemaMatches(
-    schema =>
+    (schema) =>
       schema.hasOwnProperty('maximum') &&
       schema.hasOwnProperty('minimum') &&
       schema.hasOwnProperty('default')
@@ -567,7 +622,7 @@ export const hasCategory = (categorization: Categorization): boolean => {
   }
   // all children of the categorization have to be categories
   return categorization.elements
-    .map(elem =>
+    .map((elem) =>
       isCategorization(elem) ? hasCategory(elem) : isCategory(elem)
     )
     .reduce((prev, curr) => prev && curr, true);
@@ -576,9 +631,7 @@ export const hasCategory = (categorization: Categorization): boolean => {
 export const categorizationHasCategory = (uischema: UISchemaElement) =>
   hasCategory(uischema as Categorization);
 
-export const not = (tester: Tester): Tester => (
-  uischema: UISchemaElement,
-  schema: JsonSchema,
-  context: TesterContext
-
-) => !tester(uischema, schema, context);
+export const not =
+  (tester: Tester): Tester =>
+  (uischema: UISchemaElement, schema: JsonSchema, context: TesterContext) =>
+    !tester(uischema, schema, context);

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 type { JsonFormsCellRendererRegistryEntry } from '../reducers';
 import type { AnyAction, Dispatch } from './type';
-import {
-  formatErrorMessage,
-  Resolve,
-} from './util';
-import {
-  isInherentlyEnabled,
-  isVisible,
-} from './runtime';
+import { Resolve } from './util';
+import { isInherentlyEnabled, isVisible } from './runtime';
 import {
   DispatchPropsOfControl,
   EnumOption,
@@ -53,11 +47,9 @@ import {
   OwnPropsOfEnum,
   StatePropsOfScopedRenderer,
 } from './renderer';
+import { getCombinedErrorMessage, getI18nKeyPrefix } from '../i18n';
 import type { JsonFormsState } from '../store';
 import type { JsonSchema } from '../models';
-import { getI18nKeyPrefix } from '../i18n';
-
-export type { JsonFormsCellRendererRegistryEntry };
 
 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

@@ -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

@@ -79,5 +79,5 @@ export const createLabelDescriptionFrom = (
 
 const labelDescription = (text: string, show: boolean): LabelDescription => ({
   text: text,
-  show: show
+  show: show,
 });