@gravity-ui/dynamic-forms 3.3.0 → 3.4.1

package/build/cjs/lib/kit/validators/validators.js

@@ -6,79 +6,83 @@ const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const validators_1 = require("../validators");
 const helpers_1 = require("./helpers");
 const getArrayValidator = (params = {}) => {
-    const { ignoreRequiredCheck, ignoreMaxLengthCheck, ignoreMinLengthCheck } = params;
+    const { ignoreRequiredCheck, ignoreMaxLengthCheck, ignoreMinLengthCheck, customErrorMessages } = params;
+    const errorMessages = Object.assign(Object.assign({}, validators_1.ErrorMessages), customErrorMessages);
     return (spec, value) => {
         const valueLength = (value === null || value === void 0 ? void 0 : value.length) || 0;
         if (!ignoreRequiredCheck && spec.required && !lodash_1.default.isArray(value)) {
-            return validators_1.ErrorMessages.REQUIRED;
+            return errorMessages.REQUIRED;
         }
         if (!ignoreMaxLengthCheck &&
             typeof spec.maxLength === 'bigint' &&
             valueLength > spec.maxLength) {
-            return validators_1.ErrorMessages.maxLengthArr(spec.maxLength);
+            return errorMessages.maxLengthArr(spec.maxLength);
         }
         if (!ignoreMinLengthCheck &&
             typeof spec.minLength === 'bigint' &&
             valueLength < spec.minLength) {
-            return validators_1.ErrorMessages.minLengthArr(spec.minLength);
+            return errorMessages.minLengthArr(spec.minLength);
         }
         return false;
     };
 };
 exports.getArrayValidator = getArrayValidator;
 const getBooleanValidator = (params = {}) => {
-    const { ignoreRequiredCheck } = params;
+    const { ignoreRequiredCheck, customErrorMessages } = params;
+    const errorMessages = Object.assign(Object.assign({}, validators_1.ErrorMessages), customErrorMessages);
     return (spec, value) => {
         if (!ignoreRequiredCheck && spec.required && !value) {
-            return validators_1.ErrorMessages.REQUIRED;
+            return errorMessages.REQUIRED;
         }
         return false;
     };
 };
 exports.getBooleanValidator = getBooleanValidator;
 const getNumberValidator = (params = {}) => {
-    const { ignoreRequiredCheck, ignoreSpaceStartCheck, ignoreSpaceEndCheck, ignoreNumberCheck, ignoreMaximumCheck, ignoreMinimumCheck, ignoreIntCheck, ignoreDotEnd, ignoreZeroStart, } = params;
+    const { ignoreRequiredCheck, ignoreSpaceStartCheck, ignoreSpaceEndCheck, ignoreNumberCheck, ignoreMaximumCheck, ignoreMinimumCheck, ignoreIntCheck, ignoreDotEnd, ignoreZeroStart, customErrorMessages, } = params;
+    const errorMessages = Object.assign(Object.assign({}, validators_1.ErrorMessages), customErrorMessages);
+    // eslint-disable-next-line complexity
     return (spec, value = '') => {
         const stringValue = String(value);
         if (!ignoreRequiredCheck && spec.required && !stringValue.length) {
-            return validators_1.ErrorMessages.REQUIRED;
+            return errorMessages.REQUIRED;
         }
         if (stringValue.length) {
             if (!ignoreSpaceStartCheck && !stringValue[0].trim()) {
-                return validators_1.ErrorMessages.SPACE_START;
+                return errorMessages.SPACE_START;
             }
             if (!ignoreSpaceEndCheck && !stringValue[stringValue.length - 1].trim()) {
-                return validators_1.ErrorMessages.SPACE_END;
+                return errorMessages.SPACE_END;
             }
             if (!ignoreDotEnd && stringValue[stringValue.length - 1] === '.') {
-                return validators_1.ErrorMessages.DOT_END;
+                return errorMessages.DOT_END;
             }
             if (!ignoreNumberCheck && !(0, helpers_1.isFloat)(stringValue)) {
-                return validators_1.ErrorMessages.NUMBER;
+                return errorMessages.NUMBER;
             }
             if (!ignoreZeroStart &&
                 ((stringValue.length > 1 && stringValue[0] === '0' && stringValue[1] !== '.') ||
                     (stringValue.length > 2 &&
                         stringValue.substring(0, 2) === '-0' &&
                         stringValue[2] !== '.'))) {
-                return validators_1.ErrorMessages.ZERO_START;
+                return errorMessages.ZERO_START;
             }
         }
         if (!ignoreMaximumCheck &&
             lodash_1.default.isNumber(spec.maximum) &&
             stringValue.length &&
             Number(stringValue) > spec.maximum) {
-            return validators_1.ErrorMessages.maxNumber(spec.maximum);
+            return errorMessages.maxNumber(spec.maximum);
         }
         if (!ignoreMinimumCheck &&
             lodash_1.default.isNumber(spec.minimum) &&
             stringValue.length &&
             spec.minimum > Number(stringValue)) {
-            return validators_1.ErrorMessages.minNumber(spec.minimum);
+            return errorMessages.minNumber(spec.minimum);
         }
         if (lodash_1.default.isString(spec.format) && stringValue.length) {
             if (!ignoreIntCheck && spec.format === 'int64' && !(0, helpers_1.isInt)(stringValue)) {
-                return validators_1.ErrorMessages.INT;
+                return errorMessages.INT;
             }
         }
         return false;
@@ -86,46 +90,49 @@ const getNumberValidator = (params = {}) => {
 };
 exports.getNumberValidator = getNumberValidator;
 const getObjectValidator = (params = {}) => {
-    const { ignoreRequiredCheck } = params;
+    const { ignoreRequiredCheck, customErrorMessages } = params;
+    const errorMessages = Object.assign(Object.assign({}, validators_1.ErrorMessages), customErrorMessages);
     return (spec, value) => {
         if (!ignoreRequiredCheck && spec.required && !value) {
-            return validators_1.ErrorMessages.REQUIRED;
+            return errorMessages.REQUIRED;
         }
         return false;
     };
 };
 exports.getObjectValidator = getObjectValidator;
 const getStringValidator = (params = {}) => {
-    const { ignoreRequiredCheck, ignoreSpaceStartCheck, ignoreSpaceEndCheck, ignoreMaxLengthCheck, ignoreMinLengthCheck, ignoreRegExpCheck, } = params;
+    const { ignoreRequiredCheck, ignoreSpaceStartCheck, ignoreSpaceEndCheck, ignoreMaxLengthCheck, ignoreMinLengthCheck, ignoreRegExpCheck, customErrorMessages, } = params;
+    const errorMessages = Object.assign(Object.assign({}, validators_1.ErrorMessages), customErrorMessages);
+    // eslint-disable-next-line complexity
     return (spec, value = '') => {
         const valueLength = value === null || value === void 0 ? void 0 : value.length;
         if (!ignoreRequiredCheck && spec.required && !valueLength) {
-            return validators_1.ErrorMessages.REQUIRED;
+            return errorMessages.REQUIRED;
         }
         if (valueLength) {
             if (!ignoreSpaceStartCheck && !value[0].trim()) {
-                return validators_1.ErrorMessages.SPACE_START;
+                return errorMessages.SPACE_START;
             }
             if (!ignoreSpaceEndCheck && !value[value.length - 1].trim()) {
-                return validators_1.ErrorMessages.SPACE_END;
+                return errorMessages.SPACE_END;
             }
         }
         if (!ignoreMaxLengthCheck &&
             typeof spec.maxLength === 'bigint' &&
             valueLength > spec.maxLength) {
-            return validators_1.ErrorMessages.maxLength(spec.maxLength);
+            return errorMessages.maxLength(spec.maxLength);
         }
         if (!ignoreMinLengthCheck &&
             typeof spec.minLength === 'bigint' &&
             valueLength < spec.minLength) {
-            return validators_1.ErrorMessages.minLength(spec.minLength);
+            return errorMessages.minLength(spec.minLength);
         }
         if (lodash_1.default.isString(spec.pattern) && spec.pattern.length) {
             const regex = new RegExp(spec.pattern);
             if (!ignoreRegExpCheck && !regex.test(value)) {
                 return lodash_1.default.isString(spec.patternError) && spec.patternError.length
                     ? spec.patternError
-                    : validators_1.ErrorMessages.INVALID;
+                    : errorMessages.INVALID;
             }
         }
         return false;

package/build/esm/lib/core/components/Form/Controller/Controller.js

@@ -3,12 +3,12 @@ import _ from 'lodash';
 import { useControllerMirror, useDynamicFormsCtx, useSearch } from '../hooks';
 import { callUnmout, getFieldMethods, initializeStore, updateStore } from './utils';
 export const Controller = ({ spec: _spec, name, value: valueFromParent, parentOnChange, parentOnUnmount, }) => {
-    const { config, tools, mutators, __mirror } = useDynamicFormsCtx();
+    const { config, tools, mutatorsStore, __mirror } = useDynamicFormsCtx();
     const firstRenderRef = React.useRef(true);
     const [store, setStore] = React.useState(initializeStore({
         name,
         spec: _spec,
-        mutators,
+        mutatorsStore,
         config,
         valueFromParent,
         tools,
@@ -88,7 +88,7 @@ export const Controller = ({ spec: _spec, name, value: valueFromParent, parentOn
                 name,
                 parentOnChange,
                 parentOnUnmount,
-                mutators,
+                mutatorsStore,
                 config,
                 tools,
                 methodOnChange: fieldMethods.onChange,
@@ -100,7 +100,7 @@ export const Controller = ({ spec: _spec, name, value: valueFromParent, parentOn
         name,
         parentOnChange,
         parentOnUnmount,
-        mutators,
+        mutatorsStore,
         config,
         tools.onChange,
         tools.onUnmount,

package/build/esm/lib/core/components/Form/Controller/types.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
 import { FormValue, Spec } from '../../../types';
-import { DynamicFormConfig, DynamicFormMutators, DynamicFormsContext, FieldRenderProps, FieldValue, IndependentInputEntity, InputEntity, LayoutType, ValidateError } from '../types';
+import { DynamicFormConfig, DynamicFormMutatorsStore, DynamicFormsContext, FieldRenderProps, FieldValue, IndependentInputEntity, InputEntity, LayoutType, ValidateError } from '../types';
 export interface GetSpecParams<SpecType extends Spec> {
     name: string;
     spec: SpecType;
-    mutators: DynamicFormMutators;
+    mutatorsStore: DynamicFormMutatorsStore;
 }
 export interface GetComponentsParams<SpecType extends Spec> {
     spec: SpecType;
@@ -30,7 +30,7 @@ export interface GetFieldInitialsParams<DirtyValue extends FieldValue, Value ext
     valueFromParent: DirtyValue;
     initialValue: DirtyValue;
     validate: (value?: Value) => ValidateError;
-    mutators: DynamicFormMutators;
+    mutatorsStore: DynamicFormMutatorsStore;
 }
 export type FieldMethod<DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec, Params extends any = undefined> = (store: ControllerStore<DirtyValue, Value, SpecType>, params: Params) => ControllerStore<DirtyValue, Value, SpecType>;
 export interface GetFieldMethodsReturn<DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec> {
@@ -49,7 +49,7 @@ export interface GetFieldMethodsReturn<DirtyValue extends FieldValue, Value exte
 export interface InitializeStoreParams<DirtyValue extends FieldValue, SpecType extends Spec> {
     name: string;
     spec: SpecType;
-    mutators: DynamicFormMutators;
+    mutatorsStore: DynamicFormMutatorsStore;
     config: DynamicFormConfig;
     valueFromParent: DirtyValue;
     tools: DynamicFormsContext['tools'];
@@ -62,7 +62,7 @@ export interface ControllerStore<DirtyValue extends FieldValue, Value extends Fo
     initialSpec: SpecType;
     config: DynamicFormConfig;
     tools: DynamicFormsContext['tools'];
-    mutators: DynamicFormMutators;
+    mutatorsStore: DynamicFormMutatorsStore;
     render: (props: FieldRenderProps<DirtyValue>) => JSX.Element | null;
     validate: (value?: Value) => ValidateError;
     parentOnChange: ((childName: string, childValue: FieldValue, childErrors: Record<string, ValidateError>) => void) | null;
@@ -90,7 +90,7 @@ export interface UpdateStoreParams<DirtyValue extends FieldValue, Value extends
     name: string;
     parentOnChange: ((childName: string, childValue: FieldValue, childErrors: Record<string, ValidateError>) => void) | null;
     parentOnUnmount: ((childName: string) => void) | null;
-    mutators: DynamicFormMutators;
+    mutatorsStore: DynamicFormMutatorsStore;
     valueFromParent: DirtyValue;
     config: DynamicFormConfig;
     tools: DynamicFormsContext['tools'];

package/build/esm/lib/core/components/Form/Controller/utils.d.ts

@@ -1,17 +1,17 @@
 import { FormValue, Spec } from '../../../types';
-import { FieldRenderProps, FieldValue, ValidateError } from '../types';
+import { BaseValidateError, FieldRenderProps, FieldValue, ValidateError } from '../types';
 import { ControllerStore, GetComponentsParams, GetComponentsReturn, GetFieldInitialsParams, GetFieldMethodsReturn, GetRenderParams, GetSpecParams, GetValidateParams, InitializeStoreParams, UpdateStoreParams } from './types';
 export declare const updateParentStore: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>(store: ControllerStore<DirtyValue, Value, SpecType>) => void;
 export declare const callUnmout: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>(store: ControllerStore<DirtyValue, Value, SpecType>) => void;
-export declare const getSpec: <SpecType extends Spec>({ name, spec, mutators, }: GetSpecParams<SpecType>) => SpecType;
+export declare const getSpec: <SpecType extends Spec>({ name, spec, mutatorsStore, }: GetSpecParams<SpecType>) => SpecType;
 export declare const getComponents: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>({ spec, config, }: GetComponentsParams<SpecType>) => GetComponentsReturn<DirtyValue, SpecType>;
 export declare const getRender: <DirtyValue extends FieldValue, SpecType extends Spec>({ name, spec, inputEntity, Layout, }: GetRenderParams<DirtyValue, SpecType>) => (props: FieldRenderProps<DirtyValue>) => JSX.Element | null;
 export declare const getValidate: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>({ spec, config, }: GetValidateParams<SpecType>) => (value?: Value | undefined) => ValidateError;
-export declare const getFieldInitials: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>({ name, spec, valueFromParent, initialValue, validate, mutators, }: GetFieldInitialsParams<DirtyValue, Value, SpecType>) => {
+export declare const getFieldInitials: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>({ name, spec, valueFromParent, initialValue, validate, mutatorsStore, }: GetFieldInitialsParams<DirtyValue, Value, SpecType>) => {
     initialValue: DirtyValue;
     active: boolean;
     dirty: boolean;
-    error: string | boolean | import("../types").AsyncValidateError | undefined;
+    error: BaseValidateError | import("../types").AsyncValidateError;
     invalid: boolean;
     modified: boolean;
     pristine: boolean;
@@ -22,5 +22,5 @@ export declare const getFieldInitials: <DirtyValue extends FieldValue, Value ext
     childErrors: {};
 };
 export declare const getFieldMethods: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>() => GetFieldMethodsReturn<DirtyValue, Value, SpecType>;
-export declare const initializeStore: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>({ name, spec: _spec, mutators, config, valueFromParent, tools, parentOnChange, parentOnUnmount, }: InitializeStoreParams<DirtyValue, SpecType>) => ControllerStore<DirtyValue, Value, SpecType>;
-export declare const updateStore: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>({ store, setStore, spec: _spec, name, parentOnChange, parentOnUnmount, mutators, valueFromParent, config, tools, methodOnChange, }: UpdateStoreParams<DirtyValue, Value, SpecType>) => void;
+export declare const initializeStore: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>({ name, spec: _spec, mutatorsStore, config, valueFromParent, tools, parentOnChange, parentOnUnmount, }: InitializeStoreParams<DirtyValue, SpecType>) => ControllerStore<DirtyValue, Value, SpecType>;
+export declare const updateStore: <DirtyValue extends FieldValue, Value extends FormValue, SpecType extends Spec>({ store, setStore, spec: _spec, name, parentOnChange, parentOnUnmount, mutatorsStore, valueFromParent, config, tools, methodOnChange, }: UpdateStoreParams<DirtyValue, Value, SpecType>) => void;

package/build/esm/lib/core/components/Form/Controller/utils.js

@@ -5,20 +5,24 @@ import { SpecTypes } from '../../../constants';
 import { isArraySpec, isCorrectSpec, isNumberSpec, isObjectSpec } from '../../../helpers';
 import { EMPTY_MUTATOR, OBJECT_ARRAY_CNT, OBJECT_ARRAY_FLAG } from '../constants';
 import { isArrayItem, isCorrectConfig, transformArrIn, transformArrOut } from '../utils';
-const isErrorMutatorCorrect = (errorMutator) => errorMutator !== EMPTY_MUTATOR && (_.isString(errorMutator) || _.isBoolean(errorMutator));
+const isErrorMutatorCorrect = (errorMutator) => errorMutator !== EMPTY_MUTATOR &&
+    (_.isString(errorMutator.value) ||
+        _.isBoolean(errorMutator.value) ||
+        _.isUndefined(errorMutator.value));
 const isValueMutatorCorrect = (valueMutator, spec) => valueMutator !== EMPTY_MUTATOR &&
-    (typeof valueMutator === spec.type ||
-        (_.isArray(valueMutator) && spec.type === SpecTypes.Array));
+    (typeof valueMutator.value === spec.type ||
+        (_.isArray(valueMutator.value) && spec.type === SpecTypes.Array) ||
+        valueMutator.value === undefined);
 export const updateParentStore = (store) => {
     (store.parentOnChange ? store.parentOnChange : store.tools.onChange)(store.name, store.state.value, Object.assign(Object.assign({}, store.state.childErrors), { [store.name]: store.state.error }));
 };
 export const callUnmout = (store) => {
     (store.parentOnUnmount ? store.parentOnUnmount : store.tools.onUnmount)(store.name);
 };
-export const getSpec = ({ name, spec, mutators, }) => {
-    const mutator = _.get(mutators.spec, name, EMPTY_MUTATOR);
+export const getSpec = ({ name, spec, mutatorsStore, }) => {
+    const mutator = _.get(mutatorsStore.spec, name, EMPTY_MUTATOR);
     if (mutator !== EMPTY_MUTATOR) {
-        const mutatedSpec = _.merge(_.cloneDeep(spec), mutator);
+        const mutatedSpec = _.merge(_.cloneDeep(spec), mutator.value);
         if (isCorrectSpec(mutatedSpec)) {
             return mutatedSpec;
         }
@@ -80,11 +84,11 @@ export const getValidate = ({ spec, config, }) => {
     }
     return validate;
 };
-export const getFieldInitials = ({ name, spec, valueFromParent, initialValue, validate, mutators, }) => {
-    const valueMutator = transformArrIn(_.get(mutators.values, name, EMPTY_MUTATOR));
+export const getFieldInitials = ({ name, spec, valueFromParent, initialValue, validate, mutatorsStore, }) => {
+    const valueMutator = transformArrIn(_.get(mutatorsStore.values, name, EMPTY_MUTATOR));
     let value = _.cloneDeep(valueFromParent);
     if (isValueMutatorCorrect(valueMutator, spec)) {
-        value = valueMutator;
+        value = valueMutator.value;
     }
     if (_.isNil(value)) {
         if (spec.defaultValue) {
@@ -101,11 +105,11 @@ export const getFieldInitials = ({ name, spec, valueFromParent, initialValue, va
             }
         }
     }
-    let errorMutator = _.get(mutators.errors, name, EMPTY_MUTATOR);
+    let errorMutator = _.get(mutatorsStore.errors, name, EMPTY_MUTATOR);
     if (!isErrorMutatorCorrect(errorMutator)) {
-        errorMutator = undefined;
+        errorMutator = { value: undefined };
     }
-    const error = (validate === null || validate === void 0 ? void 0 : validate(transformArrOut(value))) || errorMutator;
+    const error = (validate === null || validate === void 0 ? void 0 : validate(transformArrOut(value))) || (errorMutator === null || errorMutator === void 0 ? void 0 : errorMutator.value);
     const dirty = !_.isEqual(value, initialValue);
     return {
         initialValue,
@@ -197,8 +201,8 @@ export const getFieldMethods = () => {
         onItemRemove,
     };
 };
-export const initializeStore = ({ name, spec: _spec, mutators, config, valueFromParent, tools, parentOnChange, parentOnUnmount, }) => {
-    const spec = getSpec({ name, spec: _spec, mutators });
+export const initializeStore = ({ name, spec: _spec, mutatorsStore, config, valueFromParent, tools, parentOnChange, parentOnUnmount, }) => {
+    const spec = getSpec({ name, spec: _spec, mutatorsStore });
     const components = getComponents({ spec, config });
     const render = getRender(Object.assign({ name, spec }, components));
     const validate = getValidate({ spec, config });
@@ -207,7 +211,7 @@ export const initializeStore = ({ name, spec: _spec, mutators, config, valueFrom
         spec,
         valueFromParent,
         validate,
-        mutators,
+        mutatorsStore,
         initialValue: _.get(tools.initialValue, name),
     });
     const initialsStore = {
@@ -216,7 +220,7 @@ export const initializeStore = ({ name, spec: _spec, mutators, config, valueFrom
         initialSpec: _spec,
         config,
         tools,
-        mutators,
+        mutatorsStore,
         render,
         validate,
         parentOnChange,
@@ -228,14 +232,14 @@ export const initializeStore = ({ name, spec: _spec, mutators, config, valueFrom
     }
     return initialsStore;
 };
-export const updateStore = ({ store, setStore, spec: _spec, name, parentOnChange, parentOnUnmount, mutators, valueFromParent, config, tools, methodOnChange, }) => {
-    const storeSpecMutator = _.get(store.mutators.spec, store.name, EMPTY_MUTATOR);
-    const storeValueMutator = _.get(store.mutators.values, store.name, EMPTY_MUTATOR);
-    const storeErrorMutator = _.get(store.mutators.errors, store.name, EMPTY_MUTATOR);
-    const specMutator = _.get(mutators.errors, name, EMPTY_MUTATOR);
-    const valueMutator = _.get(mutators.values, name, EMPTY_MUTATOR);
-    const errorMutator = _.get(mutators.errors, name, EMPTY_MUTATOR);
-    const valueMutatorUpdated = isValueMutatorCorrect(valueMutator, getSpec({ name, spec: _spec, mutators })) &&
+export const updateStore = ({ store, setStore, spec: _spec, name, parentOnChange, parentOnUnmount, mutatorsStore, valueFromParent, config, tools, methodOnChange, }) => {
+    const storeSpecMutator = _.get(store.mutatorsStore.spec, store.name, EMPTY_MUTATOR);
+    const storeValueMutator = _.get(store.mutatorsStore.values, store.name, EMPTY_MUTATOR);
+    const storeErrorMutator = _.get(store.mutatorsStore.errors, store.name, EMPTY_MUTATOR);
+    const specMutator = _.get(mutatorsStore.spec, name, EMPTY_MUTATOR);
+    const valueMutator = _.get(mutatorsStore.values, name, EMPTY_MUTATOR);
+    const errorMutator = _.get(mutatorsStore.errors, name, EMPTY_MUTATOR);
+    const valueMutatorUpdated = isValueMutatorCorrect(valueMutator, getSpec({ name, spec: _spec, mutatorsStore })) &&
         valueMutator !== storeValueMutator;
     const errorMutatorUpdated = isErrorMutatorCorrect(errorMutator) && errorMutator !== storeErrorMutator;
     const updateState = valueMutatorUpdated || errorMutatorUpdated;
@@ -252,7 +256,7 @@ export const updateStore = ({ store, setStore, spec: _spec, name, parentOnChange
         setStore(initializeStore({
             name,
             spec: _spec,
-            mutators,
+            mutatorsStore,
             config,
             valueFromParent,
             tools,
@@ -264,7 +268,7 @@ export const updateStore = ({ store, setStore, spec: _spec, name, parentOnChange
         let nextStore = Object.assign(Object.assign({}, initializeStore({
             name,
             spec: _spec,
-            mutators,
+            mutatorsStore,
             config,
             valueFromParent,
             tools,
@@ -272,7 +276,9 @@ export const updateStore = ({ store, setStore, spec: _spec, name, parentOnChange
             parentOnUnmount,
         })), { state: store.state });
         if (updateState) {
-            nextStore = methodOnChange(nextStore, Object.assign({ valOrSetter: (value) => valueMutatorUpdated ? valueMutator : value }, (errorMutatorUpdated ? { errorMutator } : {})));
+            nextStore = methodOnChange(nextStore, Object.assign({ valOrSetter: (value) => valueMutatorUpdated ? valueMutator.value : value }, (errorMutatorUpdated
+                ? { errorMutator: errorMutator.value }
+                : {})));
         }
         setStore(nextStore);
     }
@@ -281,11 +287,15 @@ export const updateStore = ({ store, setStore, spec: _spec, name, parentOnChange
             parentOnUnmount,
             tools });
         if (updateState) {
-            nextStore = methodOnChange(nextStore, Object.assign({ valOrSetter: (value) => valueMutatorUpdated ? valueMutator : value }, (errorMutatorUpdated ? { errorMutator } : {})));
+            nextStore = methodOnChange(nextStore, Object.assign({ valOrSetter: (value) => valueMutatorUpdated ? valueMutator.value : value }, (errorMutatorUpdated
+                ? { errorMutator: errorMutator.value }
+                : {})));
         }
         setStore(nextStore);
     }
     else if (updateState) {
-        setStore(methodOnChange(store, Object.assign({ valOrSetter: (value) => valueMutatorUpdated ? valueMutator : value }, (errorMutatorUpdated ? { errorMutator } : {}))));
+        setStore(methodOnChange(Object.assign(Object.assign({}, store), { mutatorsStore }), Object.assign({ valOrSetter: (value) => valueMutatorUpdated ? valueMutator.value : value }, (errorMutatorUpdated
+            ? { errorMutator: errorMutator.value }
+            : {}))));
     }
 };

package/build/esm/lib/core/components/Form/DynamicField.js

@@ -10,7 +10,7 @@ export const DynamicField = ({ name, spec, config, Monaco, generateRandomValue,
     const SearchContext = useCreateSearchContext();
     const { tools, store } = useStore(name);
     const watcher = useIntegrationFF(store, withoutInsertFFDebounce);
-    const { mutators, mutateDFState } = useMutators(externalMutators);
+    const { mutatorsStore, mutateDFState } = useMutators(externalMutators);
     const { store: searchStore, setField, removeField, isHiddenField } = useSearchStore();
     const context = React.useMemo(() => ({
         config,
@@ -18,9 +18,9 @@ export const DynamicField = ({ name, spec, config, Monaco, generateRandomValue,
         generateRandomValue,
         tools: Object.assign(Object.assign({}, tools), { mutateDFState }),
         store,
-        mutators,
+        mutatorsStore,
         __mirror,
-    }), [tools, config, Monaco, __mirror, generateRandomValue, mutators, mutateDFState, store]);
+    }), [tools, config, Monaco, __mirror, generateRandomValue, mutatorsStore, mutateDFState, store]);
     const searchContext = React.useMemo(() => ({
         setField,
         removeField,

package/build/esm/lib/core/components/Form/hooks/useMutators.d.ts

@@ -1,5 +1,5 @@
-import { DynamicFormMutators } from '../types';
+import { DynamicFormMutators, DynamicFormMutatorsStore } from '../types';
 export declare const useMutators: (externalMutators?: DynamicFormMutators) => {
-    mutators: DynamicFormMutators;
+    mutatorsStore: DynamicFormMutatorsStore;
     mutateDFState: (mutators: DynamicFormMutators) => void;
 };

package/build/esm/lib/core/components/Form/hooks/useMutators.js

@@ -1,10 +1,8 @@
 import React from 'react';
 import _ from 'lodash';
 export const useMutators = (externalMutators) => {
-    const firstRenderRef = React.useRef(true);
-    const [store, setStore] = React.useState(externalMutators || {});
-    const mutateDFState = React.useCallback((mutators) => {
-        const mergeSpec = (a, b) => {
+    const merge = React.useCallback((mutators, store) => {
+        const mergeSpec = (a = {}, b) => {
             const result = _.cloneDeep(a);
             const getKeys = (parent) => {
                 if (_.isObjectLike(parent)) {
@@ -20,11 +18,27 @@ export const useMutators = (externalMutators) => {
                 return [];
             };
             getKeys(b).forEach((key) => {
-                _.set(result, key, _.get(b, key));
+                _.set(result, [key[0], 'value', ...key.slice(1)], _.get(b, key));
+            });
+            return result;
+        };
+        const mergeValuesOrErrors = (a = {}, b) => {
+            const result = _.cloneDeep(a);
+            Object.keys(b).forEach((key) => {
+                _.set(result, [key, 'value'], b[key]);
             });
             return result;
         };
-        setStore((store) => (Object.assign(Object.assign(Object.assign(Object.assign({}, store), (mutators.errors ? { errors: _.merge(store.errors, mutators.errors) } : {})), (mutators.values ? { values: _.merge(store.values, mutators.values) } : {})), (mutators.spec ? { spec: mergeSpec(store.spec || {}, mutators.spec) } : {}))));
+        return Object.assign(Object.assign(Object.assign(Object.assign({}, store), (mutators.errors
+            ? { errors: mergeValuesOrErrors(store.errors, mutators.errors) }
+            : {})), (mutators.values
+            ? { values: mergeValuesOrErrors(store.values, mutators.values) }
+            : {})), (mutators.spec ? { spec: mergeSpec(store.spec, mutators.spec) } : {}));
+    }, []);
+    const firstRenderRef = React.useRef(true);
+    const [store, setStore] = React.useState(merge(externalMutators || {}, {}));
+    const mutateDFState = React.useCallback((mutators) => {
+        setStore((store) => merge(mutators, store));
     }, [setStore]);
     React.useEffect(() => {
         if (firstRenderRef.current) {
@@ -34,5 +48,5 @@ export const useMutators = (externalMutators) => {
             mutateDFState(externalMutators);
         }
     }, [externalMutators]);
-    return { mutators: store, mutateDFState };
+    return { mutatorsStore: store, mutateDFState };
 };

package/build/esm/lib/core/components/Form/types/context.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { MonacoEditorProps } from 'react-monaco-editor/lib/types';
 import { StringSpec } from '../../../types';
-import { DynamicFieldStore, DynamicFormConfig, DynamicFormMutators, FieldValue, ValidateError, WonderMirror } from './';
+import { DynamicFieldStore, DynamicFormConfig, DynamicFormMutators, DynamicFormMutatorsStore, FieldValue, ValidateError, WonderMirror } from './';
 export interface DynamicFormsContext {
     config: DynamicFormConfig;
     Monaco?: React.ComponentType<MonacoEditorProps>;
@@ -14,6 +14,6 @@ export interface DynamicFormsContext {
         mutateDFState: (mutators: DynamicFormMutators) => void;
     };
     store: DynamicFieldStore;
-    mutators: DynamicFormMutators;
+    mutatorsStore: DynamicFormMutatorsStore;
     __mirror?: WonderMirror;
 }

package/build/esm/lib/core/components/Form/types/mutators.d.ts

@@ -16,3 +16,14 @@ export interface DynamicFormMutators {
     values?: Record<string, FormValue>;
     spec?: Record<string, SpecMutator>;
 }
+export interface DynamicFormMutatorsStore {
+    errors?: Record<string, {
+        value: BaseValidateError;
+    }>;
+    values?: Record<string, {
+        value: FormValue;
+    }>;
+    spec?: Record<string, {
+        value: SpecMutator;
+    }>;
+}

package/build/esm/lib/kit/components/AccordeonCard/AccordeonCard.css

@@ -4,13 +4,13 @@
   justify-content: space-between;
   box-sizing: border-box;
   max-width: 750px;
-  box-shadow: 0 1px 5px var(--yc-color-sfx-shadow);
+  box-shadow: 0 1px 5px var(--g-color-sfx-shadow);
   border-radius: 5px;
-  color: var(--yc-color-text-primary);
-  background-color: var(--yc-color-base-float);
+  color: var(--g-color-text-primary);
+  background-color: var(--g-color-base-float);
 }
 .df-accordeon-card:hover {
-  box-shadow: 0 3px 10px var(--yc-color-sfx-shadow);
+  box-shadow: 0 3px 10px var(--g-color-sfx-shadow);
 }
 .df-accordeon-card:last-child {
   margin-bottom: 0;
@@ -33,7 +33,7 @@
   cursor: pointer;
 }
 .df-accordeon-card__header_open {
-  border-bottom: 1px solid var(--yc-color-line-generic);
+  border-bottom: 1px solid var(--g-color-line-generic);
 }
 .df-accordeon-card__header_without-action:hover {
   cursor: default;
@@ -58,7 +58,7 @@
 }
 .df-accordeon-card__header-content-description {
   margin-top: 12px;
-  color: var(--yc-color-text-complementary);
+  color: var(--g-color-text-complementary);
 }
 .df-accordeon-card__header-toggle-btn {
   flex-grow: 0;

package/build/esm/lib/kit/components/Card/Card.css

@@ -48,9 +48,9 @@
   margin-left: 10px;
 }
 .df-card__title {
-  font-size: var(--yc-text-subheader-2-font-size);
-  font-weight: var(--yc-text-subheader-font-weight);
-  line-height: var(--yc-text-subheader-2-line-height);
+  font-size: var(--g-text-subheader-2-font-size);
+  font-weight: var(--g-text-subheader-font-weight);
+  line-height: var(--g-text-subheader-2-line-height);
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

package/build/esm/lib/kit/components/ErrorWrapper/ErrorWrapper.css

@@ -17,11 +17,11 @@
 .df-error-wrapper_error .yc-text-input_view_normal:not(.df-error-wrapper-ignore) .yc-text-input__control,
 .df-error-wrapper_error .yc-text-input_view_normal:not(.df-error-wrapper-ignore) .yc-text-input__content,
 .df-error-wrapper_error .yc-checkbox__indicator:not(.df-error-wrapper-ignore)::before {
-  border-color: var(--yc-color-text-danger);
+  border-color: var(--g-color-text-danger);
 }
 .df-error-wrapper__error-text {
-  color: var(--yc-color-text-danger);
+  color: var(--g-color-text-danger);
   margin-top: 2px;
-  font-size: var(--yc-text-body-1-font-size);
-  line-height: var(--yc-text-body-1-line-height);
+  font-size: var(--g-text-body-1-font-size);
+  line-height: var(--g-text-body-1-line-height);
 }

package/build/esm/lib/kit/components/GroupIndent/GroupIndent.css

@@ -4,7 +4,7 @@
   margin-top: -11px;
   margin-bottom: 20px;
   margin-left: 5px;
-  border-left: 1px solid var(--yc-color-line-generic-accent);
+  border-left: 1px solid var(--g-color-line-generic-accent);
 }
 .df-group-indent:last-child {
   margin-bottom: 0;

package/build/esm/lib/kit/components/Inputs/FileInput/FileInput.css

@@ -11,5 +11,5 @@
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
-  color: var(--yc-color-text-secondary);
+  color: var(--g-color-text-secondary);
 }

package/build/esm/lib/kit/components/Inputs/MonacoInput/MonacoHeader.css

@@ -4,7 +4,7 @@
   justify-content: space-between;
   padding: 15px;
   align-items: center;
-  background-color: var(--yc-color-base-float-hover);
+  background-color: var(--g-color-base-float-hover);
 }
 .df-monaco-header__language {
   margin-top: 2px;