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

package/src/reducers/cells.ts

@@ -23,33 +23,34 @@
   THE SOFTWARE.
 */
 
-import { RankedTester } from '../testers';
+import type { RankedTester } from '../testers';
 import {
   ADD_CELL,
   AddCellRendererAction,
   REMOVE_CELL,
-  RemoveCellRendererAction
+  RemoveCellRendererAction,
 } from '../actions';
-import { Reducer } from '../util';
+import type { Reducer } from '../util';
 
 type ValidCellReducerActions = AddCellRendererAction | RemoveCellRendererAction;
 
-export type JsonFormsCellRendererRegistryState = JsonFormsCellRendererRegistryEntry[];
+export type JsonFormsCellRendererRegistryState =
+  JsonFormsCellRendererRegistryEntry[];
 
 export interface JsonFormsCellRendererRegistryEntry {
   tester: RankedTester;
   cell: any;
 }
 
-export const cellReducer: Reducer<JsonFormsCellRendererRegistryState, ValidCellReducerActions> = (
-  state = [],
-  { type, tester, cell }
-) => {
+export const cellReducer: Reducer<
+  JsonFormsCellRendererRegistryState,
+  ValidCellReducerActions
+> = (state = [], { type, tester, cell }) => {
   switch (type) {
     case ADD_CELL:
       return state.concat([{ tester, cell }]);
     case REMOVE_CELL:
-      return state.filter(t => t.tester !== tester);
+      return state.filter((t) => t.tester !== tester);
     default:
       return state;
   }

package/src/reducers/config.ts

@@ -26,7 +26,7 @@
 import merge from 'lodash/merge';
 import { SET_CONFIG, SetConfigAction } from '../actions';
 import { configDefault } from '../configDefault';
-import { Reducer } from '../util';
+import type { Reducer } from '../util';
 
 const applyDefaultConfiguration = (config: any = {}) =>
   merge({}, configDefault, config);

package/src/reducers/core.ts

@@ -29,7 +29,8 @@ import get from 'lodash/get';
 import filter from 'lodash/filter';
 import isEqual from 'lodash/isEqual';
 import isFunction from 'lodash/isFunction';
-import Ajv, { ErrorObject, ValidateFunction } from 'ajv';
+import type Ajv from 'ajv';
+import type { ErrorObject, ValidateFunction } from 'ajv';
 import {
   CoreActions,
   INIT,
@@ -42,12 +43,15 @@ import {
   UPDATE_DATA,
   UPDATE_ERRORS,
   UPDATE_CORE,
-  UpdateCoreAction
+  UpdateCoreAction,
 } from '../actions';
 import { createAjv, Reducer } from '../util';
-import { JsonSchema, UISchemaElement } from '../models';
+import type { JsonSchema, UISchemaElement } from '../models';
 
-export const validate = (validator: ValidateFunction | undefined, data: any): ErrorObject[] => {
+export const validate = (
+  validator: ValidateFunction | undefined,
+  data: any
+): ErrorObject[] => {
   if (validator === undefined) {
     return [];
   }
@@ -58,7 +62,10 @@ export const validate = (validator: ValidateFunction | undefined, data: any): Er
   return validator.errors;
 };
 
-export type ValidationMode = 'ValidateAndShow' | 'ValidateAndHide' | 'NoValidation';
+export type ValidationMode =
+  | 'ValidateAndShow'
+  | 'ValidateAndHide'
+  | 'NoValidation';
 
 export interface JsonFormsCore {
   data: any;
@@ -79,7 +86,7 @@ const initState: JsonFormsCore = {
   validator: undefined,
   ajv: undefined,
   validationMode: 'ValidateAndShow',
-  additionalErrors: []
+  additionalErrors: [],
 };
 
 const reuseAjvForSchema = (ajv: Ajv, schema: JsonSchema): Ajv => {
@@ -89,14 +96,15 @@ const reuseAjvForSchema = (ajv: Ajv, schema: JsonSchema): Ajv => {
   return ajv;
 };
 
-const getOrCreateAjv = (state: JsonFormsCore, action?: InitAction | UpdateCoreAction): Ajv => {
+const getOrCreateAjv = (
+  state: JsonFormsCore,
+  action?: InitAction | UpdateCoreAction
+): Ajv => {
   if (action) {
     if (hasAjvOption(action.options)) {
       // options object with ajv
       return action.options.ajv;
-    } else if (
-      action.options !== undefined
-    ) {
+    } else if (action.options !== undefined) {
       // it is not an option object => should be ajv itself => check for compile function
       if (isFunction(action.options.compile)) {
         return action.options;
@@ -135,7 +143,9 @@ const hasValidationModeOption = (option: any): option is InitActionOptions => {
   return false;
 };
 
-const hasAdditionalErrorsOption = (option: any): option is InitActionOptions => {
+const hasAdditionalErrorsOption = (
+  option: any
+): option is InitActionOptions => {
   if (option) {
     return option.additionalErrors !== undefined;
   }
@@ -152,7 +162,6 @@ const getAdditionalErrors = (
   return state.additionalErrors;
 };
 
-// tslint:disable-next-line: cyclomatic-complexity
 export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
   state = initState,
   action
@@ -162,7 +171,10 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
       const thisAjv = getOrCreateAjv(state, action);
 
       const validationMode = getValidationMode(state, action);
-      const v = validationMode === 'NoValidation' ? undefined : thisAjv.compile(action.schema);
+      const v =
+        validationMode === 'NoValidation'
+          ? undefined
+          : thisAjv.compile(action.schema);
       const e = validate(v, action.data);
       const additionalErrors = getAdditionalErrors(state, action);
 
@@ -207,7 +219,7 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
         state.errors !== errors ||
         state.validator !== validator ||
         state.validationMode !== validationMode ||
-        state.additionalErrors !== additionalErrors
+        state.additionalErrors !== additionalErrors;
       return stateChanged
         ? {
             ...state,
@@ -218,22 +230,26 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
             errors: isEqual(errors, state.errors) ? state.errors : errors,
             validator: validator,
             validationMode: validationMode,
-            additionalErrors
+            additionalErrors,
           }
         : state;
     }
     case SET_AJV: {
       const currentAjv = action.ajv;
-      const validator = state.validationMode === 'NoValidation' ? undefined : currentAjv.compile(state.schema);
+      const validator =
+        state.validationMode === 'NoValidation'
+          ? undefined
+          : currentAjv.compile(state.schema);
       const errors = validate(validator, state.data);
       return {
         ...state,
         validator,
-        errors
+        errors,
       };
     }
     case SET_SCHEMA: {
-      const needsNewValidator = action.schema && state.ajv && state.validationMode !== 'NoValidation';
+      const needsNewValidator =
+        action.schema && state.ajv && state.validationMode !== 'NoValidation';
       const v = needsNewValidator
         ? reuseAjvForSchema(state.ajv, action.schema).compile(action.schema)
         : state.validator;
@@ -242,13 +258,13 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
         ...state,
         validator: v,
         schema: action.schema,
-        errors
+        errors,
       };
     }
     case SET_UISCHEMA: {
       return {
         ...state,
-        uischema: action.uischema
+        uischema: action.uischema,
       };
     }
     case UPDATE_DATA: {
@@ -261,7 +277,7 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
         return {
           ...state,
           data: result,
-          errors
+          errors,
         };
       } else {
         const oldData: any = get(state.data, action.path);
@@ -275,14 +291,14 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
         return {
           ...state,
           data: newState,
-          errors
+          errors,
         };
       }
     }
     case UPDATE_ERRORS: {
       return {
         ...state,
-        errors: action.errors
+        errors: action.errors,
       };
     }
     case SET_VALIDATION_MODE: {
@@ -294,22 +310,24 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
         return {
           ...state,
           errors,
-          validationMode: action.validationMode
+          validationMode: action.validationMode,
         };
       }
       if (state.validationMode === 'NoValidation') {
-        const validator = reuseAjvForSchema(state.ajv, state.schema).compile(state.schema);
+        const validator = reuseAjvForSchema(state.ajv, state.schema).compile(
+          state.schema
+        );
         const errors = validate(validator, state.data);
         return {
           ...state,
           validator,
           errors,
-          validationMode: action.validationMode
+          validationMode: action.validationMode,
         };
       }
       return {
         ...state,
-        validationMode: action.validationMode
+        validationMode: action.validationMode,
       };
     }
     default:
@@ -341,62 +359,67 @@ export const getControlPath = (error: ErrorObject) => {
     return dataPath.replace(/\//g, '.').substr(1);
   }
   // dataPath was renamed to instancePath in AJV v8
-  var controlPath: string = error.instancePath;
+  let controlPath: string = error.instancePath;
 
   // change '/' chars to '.'
   controlPath = controlPath.replace(/\//g, '.');
-  
+
   const invalidProperty = getInvalidProperty(error);
   if (invalidProperty !== undefined && !controlPath.endsWith(invalidProperty)) {
     controlPath = `${controlPath}.${invalidProperty}`;
   }
-  
+
   // remove '.' chars at the beginning of paths
   controlPath = controlPath.replace(/^./, '');
   return controlPath;
-}
+};
 
-export const errorsAt = (
-  instancePath: string,
-  schema: JsonSchema,
-  matchPath: (path: string) => boolean
-) => (errors: ErrorObject[]): ErrorObject[] => {
-  // Get data paths of oneOf and anyOf errors to later determine whether an error occurred inside a subschema of oneOf or anyOf.
-  const combinatorPaths = filter(
-    errors,
-    error => error.keyword === 'oneOf' || error.keyword === 'anyOf'
-    ).map(error => getControlPath(error));
-    
-    return filter(errors, error => {
+export const errorsAt =
+  (
+    instancePath: string,
+    schema: JsonSchema,
+    matchPath: (path: string) => boolean
+  ) =>
+  (errors: ErrorObject[]): ErrorObject[] => {
+    // Get data paths of oneOf and anyOf errors to later determine whether an error occurred inside a subschema of oneOf or anyOf.
+    const combinatorPaths = filter(
+      errors,
+      (error) => error.keyword === 'oneOf' || error.keyword === 'anyOf'
+    ).map((error) => getControlPath(error));
+
+    return filter(errors, (error) => {
       // Filter errors that match any keyword that we don't want to show in the UI
       if (filteredErrorKeywords.indexOf(error.keyword) !== -1) {
         return false;
       }
-    const controlPath = getControlPath(error);
-    let result = matchPath(controlPath);
-    // In anyOf and oneOf blocks with "primitive" (i.e. string, number etc.) or array subschemas,
-    // we want to make sure that errors are only shown for the correct subschema.
-    // Therefore, we compare the error's parent schema with the property's schema.
-    // In the primitive case the error's data path is the same for all subschemas:
-    // It directly points to the property defining the anyOf/oneOf.
-    // The same holds true for errors on the array level (e.g. min item amount).
-    // In contrast, this comparison must not be done for errors whose parent schema defines an object
-    // because the parent schema can never match the property schema (e.g. for 'required' checks).
-    const parentSchema: JsonSchema | undefined = error.parentSchema;
-    if (result && !isObjectSchema(parentSchema)
-      && combinatorPaths.findIndex(p => instancePath.startsWith(p)) !== -1) {
-      result = result && isEqual(parentSchema, schema);
-    }
-    return result;
-  });
-};
+      const controlPath = getControlPath(error);
+      let result = matchPath(controlPath);
+      // In anyOf and oneOf blocks with "primitive" (i.e. string, number etc.) or array subschemas,
+      // we want to make sure that errors are only shown for the correct subschema.
+      // Therefore, we compare the error's parent schema with the property's schema.
+      // In the primitive case the error's data path is the same for all subschemas:
+      // It directly points to the property defining the anyOf/oneOf.
+      // The same holds true for errors on the array level (e.g. min item amount).
+      // In contrast, this comparison must not be done for errors whose parent schema defines an object
+      // because the parent schema can never match the property schema (e.g. for 'required' checks).
+      const parentSchema: JsonSchema | undefined = error.parentSchema;
+      if (
+        result &&
+        !isObjectSchema(parentSchema) &&
+        combinatorPaths.findIndex((p) => instancePath.startsWith(p)) !== -1
+      ) {
+        result = result && isEqual(parentSchema, schema);
+      }
+      return result;
+    });
+  };
 
 /**
  * @returns true if the schema describes an object.
  */
 const isObjectSchema = (schema?: JsonSchema): boolean => {
   return schema?.type === 'object' || !!schema?.properties;
-}
+};
 
 /**
  * The error-type of an AJV error is defined by its `keyword` property.
@@ -409,19 +432,36 @@ const isObjectSchema = (schema?: JsonSchema): boolean => {
  * - anyOf: Indicates that an anyOf definition itself is not valid because none of its subschemas matches.
  * - oneOf: Indicates that an oneOf definition itself is not valid because not exactly one of its subschemas matches.
  */
-const filteredErrorKeywords = ['additionalProperties', 'allOf', 'anyOf', 'oneOf'];
-
-const getErrorsAt = (
-  instancePath: string,
-  schema: JsonSchema,
-  matchPath: (path: string) => boolean
-) => (state: JsonFormsCore): ErrorObject[] => {
-  const errors = state.errors ?? [];
-  const additionalErrors = state.additionalErrors ?? [];
-  return errorsAt(instancePath, schema, matchPath)(state.validationMode === 'ValidateAndHide' ? additionalErrors : [...errors, ...additionalErrors]);
-}
+const filteredErrorKeywords = [
+  'additionalProperties',
+  'allOf',
+  'anyOf',
+  'oneOf',
+];
+
+const getErrorsAt =
+  (
+    instancePath: string,
+    schema: JsonSchema,
+    matchPath: (path: string) => boolean
+  ) =>
+  (state: JsonFormsCore): ErrorObject[] => {
+    const errors = state.errors ?? [];
+    const additionalErrors = state.additionalErrors ?? [];
+    return errorsAt(
+      instancePath,
+      schema,
+      matchPath
+    )(
+      state.validationMode === 'ValidateAndHide'
+        ? additionalErrors
+        : [...errors, ...additionalErrors]
+    );
+  };
 
 export const errorAt = (instancePath: string, schema: JsonSchema) =>
-  getErrorsAt(instancePath, schema, path => path === instancePath);
+  getErrorsAt(instancePath, schema, (path) => path === instancePath);
 export const subErrorsAt = (instancePath: string, schema: JsonSchema) =>
-  getErrorsAt(instancePath, schema, path => path.startsWith(instancePath));
+  getErrorsAt(instancePath, schema, (path) =>
+    path.startsWith(instancePath + '.')
+  );

package/src/reducers/default-data.ts

@@ -27,9 +27,9 @@ import {
   ADD_DEFAULT_DATA,
   RegisterDefaultDataAction,
   REMOVE_DEFAULT_DATA,
-  UnregisterDefaultDataAction
+  UnregisterDefaultDataAction,
 } from '../actions';
-import { Reducer } from '../util';
+import type { Reducer } from '../util';
 
 export interface JsonFormsDefaultDataRegistryEntry {
   schemaPath: string;
@@ -40,17 +40,17 @@ type ValidDefaultDataActions =
   | RegisterDefaultDataAction
   | UnregisterDefaultDataAction;
 
-export const defaultDataReducer: Reducer<JsonFormsDefaultDataRegistryEntry[], ValidDefaultDataActions> = (
-  state = [],
-  action
-) => {
+export const defaultDataReducer: Reducer<
+  JsonFormsDefaultDataRegistryEntry[],
+  ValidDefaultDataActions
+> = (state = [], action) => {
   switch (action.type) {
     case ADD_DEFAULT_DATA:
       return state.concat([
-        { schemaPath: action.schemaPath, data: action.data }
+        { schemaPath: action.schemaPath, data: action.data },
       ]);
     case REMOVE_DEFAULT_DATA:
-      return state.filter(t => t.schemaPath !== action.schemaPath);
+      return state.filter((t) => t.schemaPath !== action.schemaPath);
     default:
       return state;
   }

package/src/reducers/i18n.ts

@@ -23,17 +23,29 @@
   THE SOFTWARE.
 */
 
-import { defaultErrorTranslator, defaultTranslator, JsonFormsI18nState } from '../i18n';
-import { I18nActions, SET_LOCALE, SET_TRANSLATOR, UPDATE_I18N } from '../actions';
-import { Reducer } from '../util';
+import {
+  defaultErrorTranslator,
+  defaultTranslator,
+  JsonFormsI18nState,
+} from '../i18n';
+import {
+  I18nActions,
+  SET_LOCALE,
+  SET_TRANSLATOR,
+  UPDATE_I18N,
+} from '../actions';
+import type { Reducer } from '../util';
 
 export const defaultJsonFormsI18nState: Required<JsonFormsI18nState> = {
   locale: 'en',
   translate: defaultTranslator,
-  translateError: defaultErrorTranslator
+  translateError: defaultErrorTranslator,
 };
 
-export const i18nReducer: Reducer<JsonFormsI18nState, I18nActions> = (state = defaultJsonFormsI18nState, action) => {
+export const i18nReducer: Reducer<JsonFormsI18nState, I18nActions> = (
+  state = defaultJsonFormsI18nState,
+  action
+) => {
   switch (action.type) {
     case UPDATE_I18N: {
       const locale = action.locale ?? defaultJsonFormsI18nState.locale;
@@ -51,7 +63,7 @@ export const i18nReducer: Reducer<JsonFormsI18nState, I18nActions> = (state = de
           ...state,
           locale,
           translate,
-          translateError
+          translateError,
         };
       }
       return state;
@@ -60,12 +72,12 @@ export const i18nReducer: Reducer<JsonFormsI18nState, I18nActions> = (state = de
       return {
         ...state,
         translate: action.translator ?? defaultTranslator,
-        translateError: action.errorTranslator ?? defaultErrorTranslator
+        translateError: action.errorTranslator ?? defaultErrorTranslator,
       };
     case SET_LOCALE:
       return {
         ...state,
-        locale: action.locale ?? navigator.languages[0]
+        locale: action.locale ?? navigator.languages[0],
       };
     default:
       return state;
@@ -84,11 +96,11 @@ export const fetchTranslator = (state?: JsonFormsI18nState) => {
     return defaultTranslator;
   }
   return state.translate;
-}
+};
 
 export const fetchErrorTranslator = (state?: JsonFormsI18nState) => {
   if (state === undefined) {
     return defaultErrorTranslator;
   }
   return state.translateError;
-}
+};

package/src/reducers/reducers.ts

@@ -23,34 +23,23 @@
   THE SOFTWARE.
 */
 
-import { ControlElement, UISchemaElement } from '../models';
-import {
-  coreReducer,
-  errorAt,
-  subErrorsAt,
-} from './core';
+import type { ControlElement, UISchemaElement } from '../models';
+import { coreReducer, errorAt, subErrorsAt } from './core';
 import { defaultDataReducer } from './default-data';
 import { rendererReducer } from './renderers';
-import { JsonFormsState } from '../store';
+import type { JsonFormsState } from '../store';
 import type { JsonFormsUISchemaRegistryEntry } from './uischemas';
-import {
-  findMatchingUISchema,
-  uischemaRegistryReducer,
-} from './uischemas';
-import {
-  fetchErrorTranslator,
-  fetchLocale,
-  i18nReducer,
-} from './i18n';
+import { findMatchingUISchema, uischemaRegistryReducer } from './uischemas';
+import { fetchErrorTranslator, fetchLocale, i18nReducer } from './i18n';
 
 import { Generate } from '../generators';
-import { JsonSchema } from '../models/jsonSchema';
+import type { JsonSchema } from '../models/jsonSchema';
 
 import { cellReducer } from './cells';
 import { configReducer } from './config';
 import get from 'lodash/get';
 import { fetchTranslator } from '.';
-import { ErrorTranslator, Translator } from '../i18n';
+import type { ErrorTranslator, Translator } from '../i18n';
 
 export const jsonFormsReducerConfig = {
   core: coreReducer,
@@ -84,7 +73,7 @@ export const findUISchema = (
     if (typeof control.options.detail === 'string') {
       if (control.options.detail.toUpperCase() === 'GENERATE') {
         //use fallback generation function
-        if(typeof fallback === "function"){
+        if (typeof fallback === 'function') {
           return fallback();
         }
         // force generation of uischema
@@ -104,7 +93,7 @@ export const findUISchema = (
   const uiSchema = findMatchingUISchema(uischemas)(schema, schemaPath, path);
   if (uiSchema === undefined) {
     //use fallback generation function
-    if(typeof fallback === 'function'){
+    if (typeof fallback === 'function') {
       return fallback();
     }
     return Generate.uiSchema(schema, fallback, '#', rootSchema);
@@ -112,25 +101,26 @@ export const findUISchema = (
   return uiSchema;
 };
 
-export const getErrorAt = (instancePath: string, schema: JsonSchema) => (
-  state: JsonFormsState
-) => {
-  return errorAt(instancePath, schema)(state.jsonforms.core);
-};
+export const getErrorAt =
+  (instancePath: string, schema: JsonSchema) => (state: JsonFormsState) => {
+    return errorAt(instancePath, schema)(state.jsonforms.core);
+  };
 
-export const getSubErrorsAt = (instancePath: string, schema: JsonSchema) => (
-  state: JsonFormsState
-) => subErrorsAt(instancePath, schema)(state.jsonforms.core);
+export const getSubErrorsAt =
+  (instancePath: string, schema: JsonSchema) => (state: JsonFormsState) =>
+    subErrorsAt(instancePath, schema)(state.jsonforms.core);
 
 export const getConfig = (state: JsonFormsState) => state.jsonforms.config;
 
 export const getLocale = (state: JsonFormsState) =>
   fetchLocale(get(state, 'jsonforms.i18n'));
 
-export const getTranslator = () => (
-  state: JsonFormsState
-): Translator => fetchTranslator(get(state, 'jsonforms.i18n'));
+export const getTranslator =
+  () =>
+  (state: JsonFormsState): Translator =>
+    fetchTranslator(get(state, 'jsonforms.i18n'));
 
-export const getErrorTranslator = () => (
-  state: JsonFormsState
-): ErrorTranslator => fetchErrorTranslator(get(state, 'jsonforms.i18n'));
+export const getErrorTranslator =
+  () =>
+  (state: JsonFormsState): ErrorTranslator =>
+    fetchErrorTranslator(get(state, 'jsonforms.i18n'));

package/src/reducers/renderers.ts

@@ -23,14 +23,14 @@
   THE SOFTWARE.
 */
 
-import { RankedTester } from '../testers';
+import type { RankedTester } from '../testers';
 import {
   ADD_RENDERER,
   AddRendererAction,
   REMOVE_RENDERER,
-  RemoveRendererAction
+  RemoveRendererAction,
 } from '../actions';
-import { Reducer } from '../util';
+import type { Reducer } from '../util';
 
 export interface JsonFormsRendererRegistryEntry {
   tester: RankedTester;
@@ -39,17 +39,17 @@ export interface JsonFormsRendererRegistryEntry {
 
 type ValidRendererReducerActions = AddRendererAction | RemoveRendererAction;
 
-export const rendererReducer: Reducer<JsonFormsRendererRegistryEntry[], ValidRendererReducerActions> = (
-  state = [],
-  action
-) => {
+export const rendererReducer: Reducer<
+  JsonFormsRendererRegistryEntry[],
+  ValidRendererReducerActions
+> = (state = [], action) => {
   switch (action.type) {
     case ADD_RENDERER:
       return state.concat([
-        { tester: action.tester, renderer: action.renderer }
+        { tester: action.tester, renderer: action.renderer },
       ]);
     case REMOVE_RENDERER:
-      return state.filter(t => t.tester !== action.tester);
+      return state.filter((t) => t.tester !== action.tester);
     default:
       return state;
   }