@gravity-ui/dynamic-forms 5.26.0 → 5.27.1

package/build/cjs/lib/unstable/kit/form-entities/StringNumberWithScaleInput/StringNumberWithScaleInput.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const uikit_1 = require("@gravity-ui/uikit");
 const decimal_js_1 = tslib_1.__importDefault(require("decimal.js"));
+const core_1 = require("../../../core");
 const components_1 = require("../../components");
 const utils_1 = require("../../utils");
 const b = (0, utils_1.block)('string-number-with-scale-input');
@@ -18,7 +19,7 @@ const StringNumberWithScaleInput = ({ input, meta, props, schema }) => {
             const preparedScale = {};
             let minScaleLength = 0;
             Object.entries(scale).forEach(([key, value]) => {
-                if ((0, utils_1.isStringNumber)(value.factor)) {
+                if ((0, core_1.isStringNumber)(value.factor)) {
                     preparedScale[key] = value;
                     if ((value.title || key).length * 12 > minScaleLength) {
                         minScaleLength = (value.title || key).length * 12;
@@ -47,16 +48,16 @@ const StringNumberWithScaleInput = ({ input, meta, props, schema }) => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const factor = (_b = (_a = scaleKit === null || scaleKit === void 0 ? void 0 : scaleKit.scale) === null || _a === void 0 ? void 0 : _a[scaleValue[0]]) === null || _b === void 0 ? void 0 : _b.factor;
         const result = {
-            max: (0, utils_1.isStringNumber)((_c = schema.stringNumber) === null || _c === void 0 ? void 0 : _c.maximum)
+            max: (0, core_1.isStringNumber)((_c = schema.stringNumber) === null || _c === void 0 ? void 0 : _c.maximum)
                 ? (_d = schema.stringNumber) === null || _d === void 0 ? void 0 : _d.maximum
                 : undefined,
-            min: (0, utils_1.isStringNumber)((_e = schema.stringNumber) === null || _e === void 0 ? void 0 : _e.minimum)
+            min: (0, core_1.isStringNumber)((_e = schema.stringNumber) === null || _e === void 0 ? void 0 : _e.minimum)
                 ? (_f = schema.stringNumber) === null || _f === void 0 ? void 0 : _f.minimum
                 : undefined,
-            step: (0, utils_1.isStringNumber)((_g = schema.stringNumber) === null || _g === void 0 ? void 0 : _g.multipleOf)
+            step: (0, core_1.isStringNumber)((_g = schema.stringNumber) === null || _g === void 0 ? void 0 : _g.multipleOf)
                 ? (_h = schema.stringNumber) === null || _h === void 0 ? void 0 : _h.multipleOf
                 : '1',
-            defaultValue: (0, utils_1.isStringNumber)(schema.default) ? schema.default : undefined,
+            defaultValue: (0, core_1.isStringNumber)(schema.default) ? schema.default : undefined,
             value: inputValue || '',
             onUpdate: onChange,
         };
@@ -65,10 +66,10 @@ const StringNumberWithScaleInput = ({ input, meta, props, schema }) => {
                 max: result.max ? new decimal_js_1.default(result.max).div(factor).toString() : undefined,
                 min: result.min ? new decimal_js_1.default(result.min).div(factor).toString() : undefined,
                 step: new decimal_js_1.default(result.step).div(factor).toString(),
-                value: (0, utils_1.isStringNumber)(result.value)
+                value: (0, core_1.isStringNumber)(result.value)
                     ? new decimal_js_1.default(result.value).div(factor).toString()
                     : result.value,
-                onUpdate: (value) => onChange((0, utils_1.isStringNumber)(value) ? new decimal_js_1.default(value).mul(factor).toString() : value),
+                onUpdate: (value) => onChange((0, core_1.isStringNumber)(value) ? new decimal_js_1.default(value).mul(factor).toString() : value),
             };
         }
         return result;

package/build/cjs/lib/unstable/kit/overview-entities/StringNumberWithScaleValue/StringNumberWithScaleValue.d.ts

@@ -1,4 +1,4 @@
-import type { JsonSchemaString, NodeEntity } from '../../../core';
+import { type JsonSchemaString, type NodeEntity } from '../../../core';
 import { type LongValueProps } from '../../components';
 export interface StringNumberWithScaleValueProps extends Omit<LongValueProps, 'qa' | 'value'> {
     scale?: Record<string, {

package/build/cjs/lib/unstable/kit/overview-entities/StringNumberWithScaleValue/StringNumberWithScaleValue.js

@@ -6,18 +6,18 @@ const react_1 = tslib_1.__importDefault(require("react"));
 const uikit_1 = require("@gravity-ui/uikit");
 const decimal_js_1 = tslib_1.__importDefault(require("decimal.js"));
 const get_1 = tslib_1.__importDefault(require("lodash/get"));
+const core_1 = require("../../../core");
 const components_1 = require("../../components");
-const utils_1 = require("../../utils");
 const StringNumberWithScaleValue = ({ input, props }) => {
     const { scale, viewType } = props, restProps = tslib_1.__rest(props, ["scale", "viewType"]);
     const level = react_1.default.useMemo(() => {
         const determined = viewType ? (0, get_1.default)(scale, viewType) : undefined;
-        let suggested = (0, utils_1.isStringNumber)(determined === null || determined === void 0 ? void 0 : determined.factor)
+        let suggested = (0, core_1.isStringNumber)(determined === null || determined === void 0 ? void 0 : determined.factor)
             ? determined
             : undefined;
         Object.values(scale || {}).forEach((item) => {
-            if ((0, utils_1.isStringNumber)(input.value) &&
-                (0, utils_1.isStringNumber)(item.factor) &&
+            if ((0, core_1.isStringNumber)(input.value) &&
+                (0, core_1.isStringNumber)(item.factor) &&
                 new decimal_js_1.default(input.value).div(item.factor).abs().gte(1) &&
                 (!suggested || new decimal_js_1.default(item.factor).gt(suggested.factor))) {
                 suggested = item;
@@ -25,7 +25,7 @@ const StringNumberWithScaleValue = ({ input, props }) => {
         });
         return suggested;
     }, [input.value, scale, viewType]);
-    if (!(0, utils_1.isStringNumber)(input.value)) {
+    if (!(0, core_1.isStringNumber)(input.value)) {
         return react_1.default.createElement(components_1.EmptyEntityValue, null);
     }
     return (react_1.default.createElement(components_1.EntityContainer, { stretch: "fit", fill: "populated", direction: "row", gap: 0.5 },

package/build/cjs/lib/unstable/kit/utils/common.d.ts

@@ -6,6 +6,3 @@ export declare const getArrayItemParentName: (name: string) => string;
 export declare const getArrayItemIndex: (name: string) => string;
 export declare const isArrayItem: (name: string) => boolean;
 export declare const isTupleItem: (name: string, headName: string, form: FormApi) => boolean | undefined;
-export declare const isStringInt: (v: unknown) => v is string;
-export declare const isStringFloat: (v: unknown) => v is string;
-export declare const isStringNumber: (v: unknown) => v is string;

package/build/cjs/lib/unstable/kit/utils/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStringNumber = exports.isStringFloat = exports.isStringInt = exports.isTupleItem = exports.isArrayItem = exports.getArrayItemIndex = exports.getArrayItemParentName = exports.getBooleanValidationState = exports.getValidationState = void 0;
+exports.isTupleItem = exports.isArrayItem = exports.getArrayItemIndex = exports.getArrayItemParentName = exports.getBooleanValidationState = exports.getValidationState = void 0;
 const core_1 = require("../../core");
 const getValidationState = (meta) => {
     if ((meta.touched || meta.submitFailed) && meta.error) {
@@ -37,9 +37,3 @@ const isTupleItem = (name, headName, form) => {
     return parentSchema && 'items' in parentSchema && Array.isArray(parentSchema.items);
 };
 exports.isTupleItem = isTupleItem;
-const isStringInt = (v) => /^-?(0|[1-9][0-9]*)$/.test(`${v}`);
-exports.isStringInt = isStringInt;
-const isStringFloat = (v) => /^-?(0|[1-9][0-9]*)(\.[0-9]+)?$/.test(`${v}`);
-exports.isStringFloat = isStringFloat;
-const isStringNumber = (v) => (0, exports.isStringInt)(v) || (0, exports.isStringFloat)(v);
-exports.isStringNumber = isStringNumber;

package/build/cjs/lib/unstable/kit/utils/index.d.ts

@@ -1,4 +1,4 @@
 export { block } from './cn';
-export { getArrayItemIndex, getArrayItemParentName, getBooleanValidationState, getValidationState, isArrayItem, isStringInt, isStringFloat, isStringNumber, isTupleItem, } from './common';
+export { getArrayItemIndex, getArrayItemParentName, getBooleanValidationState, getValidationState, isArrayItem, isTupleItem, } from './common';
 export { parseDate } from './date';
 export { specToJsonSchema } from './transformer';

package/build/cjs/lib/unstable/kit/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.specToJsonSchema = exports.parseDate = exports.isTupleItem = exports.isStringNumber = exports.isStringFloat = exports.isStringInt = exports.isArrayItem = exports.getValidationState = exports.getBooleanValidationState = exports.getArrayItemParentName = exports.getArrayItemIndex = exports.block = void 0;
+exports.specToJsonSchema = exports.parseDate = exports.isTupleItem = exports.isArrayItem = exports.getValidationState = exports.getBooleanValidationState = exports.getArrayItemParentName = exports.getArrayItemIndex = exports.block = void 0;
 var cn_1 = require("./cn");
 Object.defineProperty(exports, "block", { enumerable: true, get: function () { return cn_1.block; } });
 var common_1 = require("./common");
@@ -9,9 +9,6 @@ Object.defineProperty(exports, "getArrayItemParentName", { enumerable: true, get
 Object.defineProperty(exports, "getBooleanValidationState", { enumerable: true, get: function () { return common_1.getBooleanValidationState; } });
 Object.defineProperty(exports, "getValidationState", { enumerable: true, get: function () { return common_1.getValidationState; } });
 Object.defineProperty(exports, "isArrayItem", { enumerable: true, get: function () { return common_1.isArrayItem; } });
-Object.defineProperty(exports, "isStringInt", { enumerable: true, get: function () { return common_1.isStringInt; } });
-Object.defineProperty(exports, "isStringFloat", { enumerable: true, get: function () { return common_1.isStringFloat; } });
-Object.defineProperty(exports, "isStringNumber", { enumerable: true, get: function () { return common_1.isStringNumber; } });
 Object.defineProperty(exports, "isTupleItem", { enumerable: true, get: function () { return common_1.isTupleItem; } });
 var date_1 = require("./date");
 Object.defineProperty(exports, "parseDate", { enumerable: true, get: function () { return date_1.parseDate; } });

package/build/cjs/lib/unstable/kit/utils/transformer.js

@@ -7,7 +7,6 @@ const isObject_1 = tslib_1.__importDefault(require("lodash/isObject"));
 const set_1 = tslib_1.__importDefault(require("lodash/set"));
 const core_1 = require("../../../core");
 const core_2 = require("../../core");
-const constants_1 = require("../constants");
 const viewSpecRules = {
     disabled: (spec, mutableSchema) => {
         if (spec.viewSpec.disabled) {
@@ -664,6 +663,15 @@ const specRules = {
             Object.entries(spec.properties).forEach(([key, childSpec]) => {
                 const childSchema = specToJsonSchema(childSpec, Object.assign({}, ((0, get_1.default)(mutableSchema, ['properties', key]) || {})), rules, errorMessages);
                 (0, set_1.default)(mutableSchema, ['properties', key], childSchema);
+                if (childSpec.required &&
+                    !(spec.viewSpec.type === 'oneof' ||
+                        spec.viewSpec.type === 'oneof_flat' ||
+                        spec.viewSpec.type === 'card_oneof' ||
+                        spec.viewSpec.type === 'multi_oneof' ||
+                        spec.viewSpec.type === 'multi_oneof_flat')) {
+                    (0, set_1.default)(mutableSchema, ['required'], [...((0, get_1.default)(mutableSchema, 'required') || []), key]);
+                    (0, set_1.default)(mutableSchema, 'nodeParameters.errorMessages.required', errorMessages.required);
+                }
             });
         }
     },
@@ -681,7 +689,7 @@ const specRules = {
         Object.values(rules.viewSpecRules).forEach((rule) => rule(spec, mutableSchema, rules, errorMessages));
     },
 };
-function specToJsonSchema(spec, mutableSchema = {}, rules, errorMessages = constants_1.errorMessages) {
+function specToJsonSchema(spec, mutableSchema = {}, rules, errorMessages = {}) {
     const mergedSpecRules = Object.assign(Object.assign({}, specRules), rules === null || rules === void 0 ? void 0 : rules.specRules);
     const mergedViewSpecRules = Object.assign(Object.assign({}, viewSpecRules), rules === null || rules === void 0 ? void 0 : rules.viewSpecRules);
     Object.values(mergedSpecRules).forEach((rule) => rule(spec, mutableSchema, { specRules: mergedSpecRules, viewSpecRules: mergedViewSpecRules }, errorMessages));

package/build/esm/lib/unstable/core/SchemaRendererNode/SchemaRendererNode.js

@@ -1,15 +1,16 @@
 import React from 'react';
+import get from 'lodash/get';
 import noop from 'lodash/noop';
 import { useForm } from 'react-final-form';
-import { SchemaRendererEventType, SchemaRendererMode } from '../constants';
+import { JsonSchemaType, SchemaRendererEventType, SchemaRendererMode } from '../constants';
 import { SCHEMA_RENDERER_SERVICE_FIELD } from '../useSchemaRenderer';
 import { useSchemaRendererState } from '../useSchemaRendererState';
-import { getServiceFieldName } from '../utils';
-import { getAccumulatedSchema, getCompareValues, getRenderKit, scheduleFlush } from './utils';
+import { getServiceFieldName, getStrictModeChecker } from '../utils';
+import { coerceToJsonSchemaType, getAccumulatedSchema, getRenderKit, scheduleFlush } from './utils';
 const SchemaRendererNodeComponent = ({ headName, modeOverride, name, schemaOverride, schemaPath, }) => {
-    var _a;
+    var _a, _b, _c, _d, _e, _f;
     const form = useForm();
-    const compareValuesRef = React.useRef(getCompareValues());
+    const strictCheckerRef = React.useRef(getStrictModeChecker());
     const fieldRef = React.useRef(null);
     const unsubscribeRef = React.useRef(null);
     const [ticks, setTicks] = React.useState({ input: 0, meta: 0 });
@@ -30,13 +31,15 @@ const SchemaRendererNodeComponent = ({ headName, modeOverride, name, schemaOverr
     const schema = React.useMemo(() => getAccumulatedSchema(schemaPath, srState === null || srState === void 0 ? void 0 : srState.schema, schemaOverride), [schemaOverride, schemaPath, srState === null || srState === void 0 ? void 0 : srState.schema]);
     const error = srState === null || srState === void 0 ? void 0 : srState.errors[name];
     const mode = modeOverride || (srState === null || srState === void 0 ? void 0 : srState.mode);
-    const jsonDefaultValues = ((_a = srState === null || srState === void 0 ? void 0 : srState.settings) === null || _a === void 0 ? void 0 : _a.jsonDefaultValues) || false;
+    // todo: check parent
+    const required = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.nodeParameters) === null || _a === void 0 ? void 0 : _a.flags) === null || _b === void 0 ? void 0 : _b.required;
+    const coerceInitialValues = (_d = (_c = srState === null || srState === void 0 ? void 0 : srState.settings) === null || _c === void 0 ? void 0 : _c.coerceInitialValues) !== null && _d !== void 0 ? _d : true;
+    const jsonDefaultValues = (_f = (_e = srState === null || srState === void 0 ? void 0 : srState.settings) === null || _e === void 0 ? void 0 : _e.jsonDefaultValues) !== null && _f !== void 0 ? _f : false;
     const kit = React.useMemo(() => getRenderKit({ config: srState === null || srState === void 0 ? void 0 : srState.config, schema }), [schema, srState === null || srState === void 0 ? void 0 : srState.config]);
     React.useMemo(() => {
         var _a;
-        if (compareValuesRef.current({
+        if (!strictCheckerRef.current.checkDiff({
             form,
-            jsonDefaultValues,
             headName,
             name,
             default: schema === null || schema === void 0 ? void 0 : schema.default,
@@ -47,13 +50,35 @@ const SchemaRendererNodeComponent = ({ headName, modeOverride, name, schemaOverr
         }
         (_a = unsubscribeRef.current) === null || _a === void 0 ? void 0 : _a.call(unsubscribeRef);
         const initialState = { schemaPath };
-        let defaultValue = schema === null || schema === void 0 ? void 0 : schema.default;
-        if (jsonDefaultValues && typeof defaultValue === 'string') {
-            try {
-                defaultValue = JSON.parse(defaultValue);
+        const defaultValue = (() => {
+            let result = schema === null || schema === void 0 ? void 0 : schema.default;
+            if (jsonDefaultValues) {
+                try {
+                    result = JSON.parse(result);
+                }
+                catch (_a) {
+                    result = undefined;
+                }
             }
-            catch (_b) { }
-        }
+            if (result === undefined && required) {
+                if ((Array.isArray(schema.type) &&
+                    schema.type.length &&
+                    !schema.type.filter((t) => t !== JsonSchemaType.Array).length) ||
+                    schema.type === JsonSchemaType.Array) {
+                    result = [];
+                }
+                else if ((Array.isArray(schema.type) &&
+                    schema.type.length &&
+                    !schema.type.filter((t) => t !== JsonSchemaType.Object).length) ||
+                    schema.type === JsonSchemaType.Object) {
+                    result = {};
+                }
+            }
+            if (coerceInitialValues) {
+                result = coerceToJsonSchemaType(result, schema === null || schema === void 0 ? void 0 : schema.type);
+            }
+            return result;
+        })();
         const unsubscribe = form.registerField(name, (f) => {
             const prevF = fieldRef.current;
             if (prevF) {
@@ -81,12 +106,36 @@ const SchemaRendererNodeComponent = ({ headName, modeOverride, name, schemaOverr
             silent: true,
             validateFields: [getServiceFieldName(SCHEMA_RENDERER_SERVICE_FIELD, headName)],
         });
-        scheduleFlush(form);
+        const castParams = (() => {
+            if (!coerceInitialValues) {
+                return undefined;
+            }
+            const formValues = form.getState().values;
+            const currentValue = name ? get(formValues, name) : formValues;
+            if (currentValue === undefined) {
+                return undefined;
+            }
+            const coercedCurrentValue = coerceToJsonSchemaType(currentValue, schema === null || schema === void 0 ? void 0 : schema.type);
+            if (coercedCurrentValue !== undefined) {
+                if (coercedCurrentValue === currentValue) {
+                    return undefined;
+                }
+                return { name, value: coercedCurrentValue };
+            }
+            if (defaultValue !== undefined) {
+                if (defaultValue === currentValue) {
+                    return undefined;
+                }
+                return { name, value: defaultValue };
+            }
+            return undefined;
+        })();
+        scheduleFlush(form, headName, castParams);
         unsubscribeRef.current = () => {
             unsubscribe();
-            scheduleFlush(form);
+            scheduleFlush(form, headName);
         };
-    }, [form, jsonDefaultValues, headName, name, schema === null || schema === void 0 ? void 0 : schema.default, schema === null || schema === void 0 ? void 0 : schema.type, schemaPath]);
+    }, [form, headName, name, schema === null || schema === void 0 ? void 0 : schema.default, schema === null || schema === void 0 ? void 0 : schema.type, schemaPath]);
     const input = React.useMemo(() => {
         var _a;
         const fieldState = form.getFieldState(name);
@@ -110,8 +159,12 @@ const SchemaRendererNodeComponent = ({ headName, modeOverride, name, schemaOverr
         };
     }, [error, form, name, ticks.meta]);
     React.useEffect(() => {
+        const strictChecker = strictCheckerRef.current;
         return () => {
             var _a;
+            if (strictChecker.isStrict()) {
+                return;
+            }
             (_a = unsubscribeRef.current) === null || _a === void 0 ? void 0 : _a.call(unsubscribeRef);
         };
     }, []);

package/build/esm/lib/unstable/core/SchemaRendererNode/utils.d.ts

@@ -1,6 +1,6 @@
 import type { FormApi } from 'final-form';
 import { SchemaRendererMode } from '../constants';
-import type { JsonSchema, NodeEntity, NodeLayout, NodesConfig } from '../types';
+import type { FieldValue, JsonSchema, NodeEntity, NodeLayout, NodesConfig } from '../types';
 type GetRenderKitParams<Schema extends JsonSchema> = {
     config?: NodesConfig;
     schema?: Schema;
@@ -23,6 +23,9 @@ type GetRenderKitReturn<Schema extends JsonSchema> = {
 };
 export declare const getRenderKit: <Schema extends JsonSchema>({ config, schema, }: GetRenderKitParams<Schema>) => GetRenderKitReturn<Schema>;
 export declare const getAccumulatedSchema: (schemaPath: string, rootSchema?: JsonSchema, override?: JsonSchema, collectedPaths?: Set<string>) => JsonSchema;
-export declare const scheduleFlush: (form: FormApi) => void;
-export declare const getCompareValues: () => (currentValues: Record<string, unknown>) => boolean;
+export declare const scheduleFlush: (form: FormApi, headName: string, change?: {
+    name: string;
+    value: FieldValue;
+}) => void;
+export declare const coerceToJsonSchemaType: (value: FieldValue, type?: JsonSchema["type"]) => FieldValue;
 export {};

package/build/esm/lib/unstable/core/SchemaRendererNode/utils.js

@@ -1,8 +1,10 @@
 import get from 'lodash/get';
+import isObjectLike from 'lodash/isObjectLike';
 import isString from 'lodash/isString';
 import set from 'lodash/set';
-import { EMPTY_OBJECT, SchemaRendererMode } from '../constants';
-import { getSchemaByPointer, getValuePaths } from '../utils';
+import { EMPTY_OBJECT, JsonSchemaType, SchemaRendererMode } from '../constants';
+import { SCHEMA_RENDERER_SERVICE_FIELD } from '../useSchemaRenderer';
+import { getSchemaByPointer, getServiceFieldName, getValuePaths, isStringNumber } from '../utils';
 const fixType = (value) => value;
 const mergeValues = (first, second) => {
     const result = {};
@@ -155,24 +157,71 @@ export const getAccumulatedSchema = (schemaPath, rootSchema, override, collected
     return accumulatedSchema;
 };
 const flushes = new WeakMap();
-export const scheduleFlush = (form) => {
-    if (flushes.get(form)) {
+export const scheduleFlush = (form, headName, change) => {
+    const scheduled = flushes.get(form);
+    if (scheduled) {
+        scheduled.headNames.add(headName);
+        if (change) {
+            scheduled.changes.set(change.name, change.value);
+        }
         return;
     }
-    flushes.set(form, true);
+    const changes = new Map();
+    const headNames = new Set([headName]);
+    if (change) {
+        changes.set(change.name, change.value);
+    }
+    flushes.set(form, { changes, headNames });
     queueMicrotask(() => {
         flushes.delete(form);
-        form.batch(() => { });
+        form.batch(() => {
+            changes.forEach((value, name) => {
+                form.change(name, value);
+            });
+        });
+        headNames.forEach((name) => {
+            var _a;
+            const srName = getServiceFieldName(SCHEMA_RENDERER_SERVICE_FIELD, name);
+            const srField = form.getFieldState(srName);
+            const srState = (_a = srField === null || srField === void 0 ? void 0 : srField.data) === null || _a === void 0 ? void 0 : _a.state;
+            srState === null || srState === void 0 ? void 0 : srState.runValidate();
+        });
     });
 };
-export const getCompareValues = () => {
-    let cachedValues;
-    return (currentValues) => {
-        if (!cachedValues ||
-            [...Object.keys(cachedValues), ...Object.keys(currentValues)].some((key) => cachedValues[key] !== currentValues[key])) {
-            cachedValues = Object.assign({}, currentValues);
+// eslint-disable-next-line complexity
+export const coerceToJsonSchemaType = (value, type) => {
+    if (value === undefined || value === null || !type) {
+        return value;
+    }
+    const typeArray = Array.isArray(type) ? type : [type];
+    if (typeArray.length &&
+        typeArray.some((t) => t === JsonSchemaType.Number || t === JsonSchemaType.Integer) &&
+        !typeArray.filter((t) => t !== JsonSchemaType.Number &&
+            t !== JsonSchemaType.Integer &&
+            t !== JsonSchemaType.Null).length) {
+        if (isStringNumber(value)) {
+            return Number(value);
+        }
+        return value;
+    }
+    if (typeArray.length &&
+        typeArray.some((t) => t === JsonSchemaType.Boolean) &&
+        !typeArray.filter((t) => t !== JsonSchemaType.Boolean && t !== JsonSchemaType.Null).length) {
+        if (value === 'true' || value === 1) {
+            return true;
+        }
+        if (value === 'false' || value === 0) {
             return false;
         }
-        return true;
-    };
+        return value;
+    }
+    if (typeArray.length &&
+        typeArray.some((t) => t === JsonSchemaType.String) &&
+        !typeArray.filter((t) => t !== JsonSchemaType.String && t !== JsonSchemaType.Null).length) {
+        if (!(typeof value === 'string' || isObjectLike(value))) {
+            return String(value);
+        }
+        return value;
+    }
+    return value;
 };

package/build/esm/lib/unstable/core/index.d.ts

@@ -5,4 +5,4 @@ export type * from './types';
 export { SCHEMA_RENDERER_SERVICE_FIELD, type SchemaRendererState, type SchemaPatch, type SchemaPatchRemover, type UseSchemaRendererParams, useSchemaRenderer, } from './useSchemaRenderer';
 export { type UseSchemaRendererStateParams, useSchemaRendererState } from './useSchemaRendererState';
 export { useSchemaRendererTools } from './useSchemaRendererTools';
-export { createNodeParametersDefiner, defineNodeEntityConfig, defineNodeLayoutConfig, getServiceFieldName, getSchemaByPointer, } from './utils';
+export { createNodeParametersDefiner, defineNodeEntityConfig, defineNodeLayoutConfig, getServiceFieldName, getSchemaByPointer, isStringFloat, isStringInt, isStringNumber, } from './utils';

package/build/esm/lib/unstable/core/index.js

@@ -4,4 +4,4 @@ export { NodeType, JsonSchemaType, SchemaRendererEventType, SchemaRendererMode }
 export { SCHEMA_RENDERER_SERVICE_FIELD, useSchemaRenderer, } from './useSchemaRenderer';
 export { useSchemaRendererState } from './useSchemaRendererState';
 export { useSchemaRendererTools } from './useSchemaRendererTools';
-export { createNodeParametersDefiner, defineNodeEntityConfig, defineNodeLayoutConfig, getServiceFieldName, getSchemaByPointer, } from './utils';
+export { createNodeParametersDefiner, defineNodeEntityConfig, defineNodeLayoutConfig, getServiceFieldName, getSchemaByPointer, isStringFloat, isStringInt, isStringNumber, } from './utils';

package/build/esm/lib/unstable/core/useSchemaRenderer/types/state.d.ts

@@ -18,6 +18,7 @@ export interface SchemaRendererState<UserContext extends Record<string, unknown>
     runValidate: () => void;
     schema: JsonSchema;
     settings: {
+        coerceInitialValues: boolean;
         jsonDefaultValues: boolean;
     };
     subscribe: (subscriber: SchemaRendererSubscriber) => string;

package/build/esm/lib/unstable/core/useSchemaRenderer/useSchemaRenderer.d.ts

@@ -3,6 +3,7 @@ import { type SchemaRendererMode } from '../constants';
 import type { ErrorMessages, FieldValue, JsonSchema, NodesConfig } from '../types';
 import type { SchemaRendererState } from './types';
 export interface UseSchemaRendererParams {
+    coerceInitialValues?: boolean;
     config?: NodesConfig;
     connectValidate?: boolean;
     errorMessages?: ErrorMessages;
@@ -13,4 +14,4 @@ export interface UseSchemaRendererParams {
     validateOnBlur: boolean;
     userContext?: SchemaRendererState['userContext'];
 }
-export declare const useSchemaRenderer: ({ config, connectValidate, errorMessages, jsonDefaultValues, mode, name: headName, schema: originalSchema, validateOnBlur, userContext, }: UseSchemaRendererParams) => FieldValidator<FieldValue>;
+export declare const useSchemaRenderer: ({ coerceInitialValues, config, connectValidate, errorMessages, jsonDefaultValues, mode, name: headName, schema: originalSchema, validateOnBlur, userContext, }: UseSchemaRendererParams) => FieldValidator<FieldValue>;

package/build/esm/lib/unstable/core/useSchemaRenderer/useSchemaRenderer.js

@@ -3,11 +3,12 @@ import React from 'react';
 import cloneDeep from 'lodash/cloneDeep';
 import { useForm } from 'react-final-form';
 import { SchemaRendererEventType } from '../constants';
-import { getServiceFieldName } from '../utils';
+import { getServiceFieldName, getStrictModeChecker } from '../utils';
 import { SCHEMA_RENDERER_SERVICE_FIELD } from './constants';
 import { getDispatch, getRunValidate, getSubscribe, getValidate } from './utils';
-export const useSchemaRenderer = ({ config, connectValidate = true, errorMessages, jsonDefaultValues = false, mode, name: headName, schema: originalSchema, validateOnBlur, userContext, }) => {
+export const useSchemaRenderer = ({ coerceInitialValues = true, config, connectValidate = true, errorMessages, jsonDefaultValues = false, mode, name: headName, schema: originalSchema, validateOnBlur, userContext, }) => {
     const form = useForm();
+    const strictCheckerRef = React.useRef(getStrictModeChecker());
     const stateRef = React.useRef(null);
     const prevParamsRef = React.useRef(null);
     const unsubscribeRef = React.useRef(null);
@@ -15,9 +16,7 @@ export const useSchemaRenderer = ({ config, connectValidate = true, errorMessage
     const dispatchEvent = React.useMemo(() => getDispatch(form, headName), [form, headName]);
     const runValidate = React.useMemo(() => getRunValidate(form, headName, validateOnBlur), [form, headName, validateOnBlur]);
     const validate = React.useMemo(() => getValidate(form, headName), [form, headName]);
-    const unsubscribeField = React.useMemo(() => {
-        var _a;
-        (_a = unsubscribeRef.current) === null || _a === void 0 ? void 0 : _a.call(unsubscribeRef);
+    const { initialEvents, initialState } = React.useMemo(() => {
         const prevParams = prevParamsRef.current;
         const prevState = stateRef.current;
         const configUpdated = config !== (prevParams === null || prevParams === void 0 ? void 0 : prevParams.config);
@@ -26,7 +25,8 @@ export const useSchemaRenderer = ({ config, connectValidate = true, errorMessage
         const modeUpdated = mode !== (prevParams === null || prevParams === void 0 ? void 0 : prevParams.mode);
         const schemaUpdated = originalSchema !== (prevParams === null || prevParams === void 0 ? void 0 : prevParams.schema);
         const userContextUpdated = userContext !== (prevParams === null || prevParams === void 0 ? void 0 : prevParams.userContext);
-        const settingsUpdated = jsonDefaultValues !== (prevParams === null || prevParams === void 0 ? void 0 : prevParams.jsonDefaultValues);
+        const settingsUpdated = coerceInitialValues !== (prevParams === null || prevParams === void 0 ? void 0 : prevParams.coerceInitialValues) ||
+            jsonDefaultValues !== (prevParams === null || prevParams === void 0 ? void 0 : prevParams.jsonDefaultValues);
         const initialState = {
             cache: nameUpdated || schemaUpdated || !(prevState === null || prevState === void 0 ? void 0 : prevState.cache) ? {} : prevState.cache,
             config: config || {},
@@ -43,7 +43,7 @@ export const useSchemaRenderer = ({ config, connectValidate = true, errorMessage
                 ? {}
                 : prevState.regularErrors,
             runValidate,
-            settings: { jsonDefaultValues },
+            settings: { coerceInitialValues, jsonDefaultValues },
             schema: nameUpdated || schemaUpdated ? cloneDeep(originalSchema) : (prevState === null || prevState === void 0 ? void 0 : prevState.schema) || {},
             subscribe,
             subscribers: (prevState === null || prevState === void 0 ? void 0 : prevState.subscribers) || { byId: {}, byName: new Map(), byPath: new Map() },
@@ -51,8 +51,7 @@ export const useSchemaRenderer = ({ config, connectValidate = true, errorMessage
             userContext: userContextUpdated ? userContext || {} : (prevState === null || prevState === void 0 ? void 0 : prevState.userContext) || {},
             waiters: nameUpdated || schemaUpdated || !(prevState === null || prevState === void 0 ? void 0 : prevState.waiters) ? {} : prevState.waiters,
         };
-        const getValidator = connectValidate ? () => validate : undefined;
-        let initialEvents = [
+        const initialEvents = [
             ...(configUpdated ? [SchemaRendererEventType.Config] : []),
             ...(errorMessagesUpdated ? [SchemaRendererEventType.ErrorMessages] : []),
             ...(nameUpdated ? [SchemaRendererEventType.Name] : []),
@@ -61,15 +60,8 @@ export const useSchemaRenderer = ({ config, connectValidate = true, errorMessage
             ...(userContextUpdated ? [SchemaRendererEventType.UserContext] : []),
             ...(settingsUpdated ? [SchemaRendererEventType.Settings] : []),
         ].map((type) => ({ type, all: true }));
-        unsubscribeRef.current = form.registerField(getServiceFieldName(SCHEMA_RENDERER_SERVICE_FIELD, headName), (f) => {
-            var _a;
-            const state = (_a = f.data) === null || _a === void 0 ? void 0 : _a.state;
-            if (state && initialEvents.length) {
-                state.dispatchEvent(initialEvents);
-                initialEvents = [];
-            }
-        }, { data: true }, { data: { state: initialState }, getValidator, silent: true, validateFields: [headName] });
         prevParamsRef.current = {
+            coerceInitialValues,
             config,
             errorMessages,
             jsonDefaultValues,
@@ -80,13 +72,12 @@ export const useSchemaRenderer = ({ config, connectValidate = true, errorMessage
             validateOnBlur,
         };
         stateRef.current = initialState;
-        return unsubscribeRef.current;
+        return { initialEvents, initialState };
     }, [
+        coerceInitialValues,
         config,
-        connectValidate,
         dispatchEvent,
         errorMessages,
-        form,
         jsonDefaultValues,
         headName,
         mode,
@@ -94,16 +85,42 @@ export const useSchemaRenderer = ({ config, connectValidate = true, errorMessage
         runValidate,
         subscribe,
         unsubscribe,
-        validate,
         validateOnBlur,
         userContext,
     ]);
+    React.useMemo(() => {
+        var _a;
+        if (!strictCheckerRef.current.checkDiff({
+            connectValidate,
+            form,
+            headName,
+            validate,
+        })) {
+            return;
+        }
+        const getValidator = connectValidate ? () => validate : undefined;
+        (_a = unsubscribeRef.current) === null || _a === void 0 ? void 0 : _a.call(unsubscribeRef);
+        unsubscribeRef.current = form.registerField(getServiceFieldName(SCHEMA_RENDERER_SERVICE_FIELD, headName), () => { }, { data: true }, {
+            data: { state: stateRef.current },
+            getValidator,
+            silent: true,
+            validateFields: [headName],
+        });
+    }, [connectValidate, form, headName, validate]);
     React.useEffect(() => {
-        runValidate();
-    }, [unsubscribeField]);
+        const srField = form.getFieldState(getServiceFieldName(SCHEMA_RENDERER_SERVICE_FIELD, headName));
+        if (srField === null || srField === void 0 ? void 0 : srField.data) {
+            srField.data.state = initialState;
+            initialState.dispatchEvent(initialEvents);
+        }
+    }, [initialEvents, initialState]);
     React.useEffect(() => {
+        const strictChecker = strictCheckerRef.current;
         return () => {
             var _a;
+            if (strictChecker.isStrict()) {
+                return;
+            }
             (_a = unsubscribeRef.current) === null || _a === void 0 ? void 0 : _a.call(unsubscribeRef);
         };
     }, []);

package/build/esm/lib/unstable/core/useSchemaRenderer/utils/get-validate.js

@@ -66,7 +66,12 @@ export const getValidate = (form, headName) => {
         Object.keys(Object.assign(Object.assign({}, srState.errors), allErrors)).forEach((key) => {
             if (srState.errors[key] !== allErrors[key]) {
                 newErrors[key] = allErrors[key];
-                srState.errors[key] = allErrors[key];
+                if (allErrors[key] === undefined) {
+                    delete srState.errors[key];
+                }
+                else {
+                    srState.errors[key] = allErrors[key];
+                }
             }
         });
         srState.waiters = Object.assign(Object.assign({}, srState.waiters), waiters);