@gravity-ui/dynamic-forms 5.19.1 → 5.21.0

package/build/esm/lib/unstable/core/types/config.d.ts

@@ -1,36 +1,37 @@
-import type { EntityType } from '../constants';
-import type { Control, View, Wrapper } from './components';
+import type { NodeType } from '../constants';
+import type { NodeEntity, NodeLayout } from './components';
 import type { JsonSchema, JsonSchemaAny, JsonSchemaArray, JsonSchemaBoolean, JsonSchemaNumber, JsonSchemaObject, JsonSchemaString } from './schema';
 import type { Validator } from './validation';
-export interface ControlsConfig<Schema extends JsonSchema> {
-    [key: string]: {
-        Component?: Control<Schema>;
-        independent?: boolean;
-    } | undefined;
+export interface NodeEntityConfig<Schema extends JsonSchema> {
+    Component?: NodeEntity<Schema>;
+    defaultProps?: Record<string, any>;
+    independent?: boolean;
 }
-export interface ViewsConfig<Schema extends JsonSchema> {
-    [key: string]: {
-        Component?: View<Schema>;
-        independent?: boolean;
-    } | undefined;
+export interface NodeLayoutConfig<Schema extends JsonSchema> {
+    Component?: NodeLayout<Schema>;
+    defaultProps?: Record<string, any>;
 }
-export interface WrappersConfig<Schema extends JsonSchema> {
-    [key: string]: Wrapper<Schema> | undefined;
+export interface NodeEntitiesConfig<Schema extends JsonSchema> {
+    [key: string]: NodeEntityConfig<Schema> | undefined;
 }
-export interface ValidatorsConfig<Schema extends JsonSchema> {
+export interface NodeLayoutsConfig<Schema extends JsonSchema> {
+    [key: string]: NodeLayoutConfig<Schema> | undefined;
+}
+export interface NodeValidatorsConfig<Schema extends JsonSchema> {
     [key: string]: Validator<Schema> | undefined;
 }
-export interface TypeConfig<Schema extends JsonSchema> {
-    controls: ControlsConfig<Schema>;
-    views: ViewsConfig<Schema>;
-    wrappers: WrappersConfig<Schema>;
-    validators: ValidatorsConfig<Schema>;
+export interface NodeTypeConfig<Schema extends JsonSchema> {
+    formEntities?: NodeEntitiesConfig<Schema>;
+    formLayouts?: NodeLayoutsConfig<Schema>;
+    overviewEntities?: NodeEntitiesConfig<Schema>;
+    overviewLayouts?: NodeLayoutsConfig<Schema>;
+    validators?: NodeValidatorsConfig<Schema>;
 }
-export interface SchemaRendererConfig {
-    [EntityType.Any]: TypeConfig<JsonSchemaAny>;
-    [EntityType.Array]: TypeConfig<JsonSchemaArray>;
-    [EntityType.Boolean]: TypeConfig<JsonSchemaBoolean>;
-    [EntityType.Number]: TypeConfig<JsonSchemaNumber>;
-    [EntityType.Object]: TypeConfig<JsonSchemaObject>;
-    [EntityType.String]: TypeConfig<JsonSchemaString>;
+export interface NodesConfig {
+    [NodeType.Any]?: NodeTypeConfig<JsonSchemaAny>;
+    [NodeType.Array]?: NodeTypeConfig<JsonSchemaArray>;
+    [NodeType.Boolean]?: NodeTypeConfig<JsonSchemaBoolean>;
+    [NodeType.Number]?: NodeTypeConfig<JsonSchemaNumber>;
+    [NodeType.Object]?: NodeTypeConfig<JsonSchemaObject>;
+    [NodeType.String]?: NodeTypeConfig<JsonSchemaString>;
 }

package/build/esm/lib/unstable/core/types/helpers.d.ts

@@ -1,18 +1,23 @@
-import type React from 'react';
-import type { JsonSchema, JsonSchemaArray, JsonSchemaBoolean, JsonSchemaNumber, JsonSchemaObject, JsonSchemaString } from './schema';
+import type { NodeType } from '../constants';
+import type { NodeEntity, NodeLayout } from './components';
+import type { NodeTypeConfig, NodesConfig } from './config';
+import type { JsonSchema, JsonSchemaAny, JsonSchemaArray, JsonSchemaBoolean, JsonSchemaNumber, JsonSchemaObject, JsonSchemaString } from './schema';
 import type { ArrayValue, FieldValue, ObjectValue } from './values';
-export type ObjectKeys<T extends Record<string, unknown>> = Exclude<keyof T, number | symbol>;
-export type SchemaToValueType<Schema extends JsonSchema<any>> = Schema extends JsonSchemaArray<any> ? ArrayValue : Schema extends JsonSchemaBoolean<any> ? boolean : Schema extends JsonSchemaNumber<any> ? number : Schema extends JsonSchemaObject<any> ? ObjectValue : Schema extends JsonSchemaString<any> ? string : FieldValue;
-export type ExtractControlProps<Control> = Control extends {
-    Component: React.ComponentType<infer ControlProps>;
-} ? ControlProps extends {
-    controlProps: infer ControlComponentProps;
-} ? ControlComponentProps : Record<string, any> : Record<string, any>;
-export type ExtractViewProps<View> = View extends {
-    Component: React.ComponentType<infer ViewProps>;
-} ? ViewProps extends {
-    viewProps: infer ViewComponentProps;
-} ? ViewComponentProps : Record<string, any> : Record<string, any>;
-export type ExtractWrapperProps<Wrapper> = Wrapper extends React.ComponentType<infer WrapperProps> ? WrapperProps extends {
-    wrapperProps: infer WrapperComponentProps;
-} ? WrapperComponentProps : Record<string, any> : Record<string, any>;
+export type EntityKind = 'formEntities' | 'overviewEntities';
+export type LayoutKind = 'formLayouts' | 'overviewLayouts';
+export type SchemaOfNodeType<Type extends NodeType> = Type extends NodeType.Any ? JsonSchemaAny : Type extends NodeType.Array ? JsonSchemaArray : Type extends NodeType.Boolean ? JsonSchemaBoolean : Type extends NodeType.Number ? JsonSchemaNumber : Type extends NodeType.Object ? JsonSchemaObject : Type extends NodeType.String ? JsonSchemaString : JsonSchema;
+export type SchemaToValueType<Schema extends JsonSchema> = Schema extends JsonSchemaArray ? ArrayValue : Schema extends JsonSchemaBoolean ? boolean : Schema extends JsonSchemaNumber ? number : Schema extends JsonSchemaObject ? ObjectValue : Schema extends JsonSchemaString ? string : FieldValue;
+export type ExtractNodeEntityProps<Component> = Component extends React.ComponentType<infer NodeEntityProps> ? NodeEntityProps extends {
+    props?: infer EntityProps;
+} ? NonNullable<EntityProps> : Record<string, any> : Record<string, any>;
+export type ExtractNodeLayoutProps<Component> = Component extends React.ComponentType<infer NodeLayoutProps> ? NodeLayoutProps extends {
+    props?: infer LayoutProps;
+} ? NonNullable<LayoutProps> : Record<string, any> : Record<string, any>;
+type ComponentOf<Entry> = Entry extends {
+    Component?: infer C;
+} ? NonNullable<C> : never;
+type OrRecord<T> = [T] extends [never] ? Record<string, any> : T;
+type NodeComponentPropsFromConfig<NodeConfig extends NodeTypeConfig<any>, Kind extends EntityKind | LayoutKind, Key extends string> = Key extends keyof NonNullable<NodeConfig[Kind]> ? Kind extends EntityKind ? ExtractNodeEntityProps<ComponentOf<NonNullable<NodeConfig[Kind]>[Key]>> : ExtractNodeLayoutProps<ComponentOf<NonNullable<NodeConfig[Kind]>[Key]>> : never;
+export type NodeComponentProps<Config extends NodesConfig, Type extends NodeType, Kind extends EntityKind | LayoutKind, Ref> = [Kind] extends [EntityKind] ? Ref extends NodeEntity<any> ? ExtractNodeEntityProps<Ref> : Ref extends string ? OrRecord<Kind extends infer K extends EntityKind ? NodeComponentPropsFromConfig<NonNullable<Config[Type]>, K, Ref> : never> : Record<string, any> : Ref extends NodeLayout<any> ? ExtractNodeLayoutProps<Ref> : Ref extends string ? OrRecord<Kind extends infer K extends LayoutKind ? NodeComponentPropsFromConfig<NonNullable<Config[Type]>, K, Ref> : never> : Record<string, any>;
+export type NodeTypeConfigKey<Config extends NodesConfig, Type extends NodeType, Kind extends keyof NodeTypeConfig<any>> = `${Extract<keyof NonNullable<NonNullable<Config[Type]>[Kind]>, string>}`;
+export {};

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

@@ -1,5 +1,6 @@
 export * from './components';
 export * from './config';
+export { JSLErrors } from './jsl-errors';
 export * from './schema';
 export * from './validation';
 export * from './values';

package/build/esm/lib/unstable/core/types/jsl-errors.d.ts

@@ -0,0 +1,105 @@
+import type { Annotation, AnnotationData } from 'json-schema-library';
+import type { JsonSchema } from './schema';
+import type { Validator } from './validation';
+type JSLError<Code extends string, Data extends Record<string, unknown> = Record<string, unknown>> = Annotation<'error', AnnotationData<Data>, Code>;
+export declare namespace JSLErrors {
+    type AdditionalItems = JSLError<'additional-items-error', {
+        key: number;
+    }>;
+    type AdditionalProperties = JSLError<'no-additional-properties-error', {
+        properties: string[];
+        property: string;
+    }>;
+    type AnyOf = JSLError<'any-of-error', {
+        anyOf: JsonSchema[];
+    }>;
+    type Const = JSLError<'const-error', {
+        expected: unknown;
+    }>;
+    type ContainsAny = JSLError<'contains-any-error'>;
+    type ContainsMin = JSLError<'contains-min-error', {
+        delta: number;
+    }>;
+    type Dependencies = JSLError<'missing-dependency-error', {
+        missingProperty: string;
+    }>;
+    type Enum = JSLError<'enum-error', {
+        values: unknown[];
+    }>;
+    type ExclusiveMaximum = JSLError<'exclusive-maximum-error', {
+        length: number | string;
+        maximum: number | string;
+    }>;
+    type ExclusiveMinimum = JSLError<'exclusive-minimum-error', {
+        length: number | string;
+        minimum: number | string;
+    }>;
+    type MaxItems = JSLError<'max-items-error', {
+        length: number;
+        maximum: number;
+    }>;
+    type MaxLength = JSLError<'max-length-error', {
+        length: number;
+        maxLength: number;
+    }>;
+    type MaxProperties = JSLError<'max-properties-error', {
+        length: number;
+        maxProperties: number;
+    }>;
+    type Maximum = JSLError<'maximum-error', {
+        length: number | string;
+        maximum: number | string;
+    }>;
+    type MinItems = JSLError<'min-items-error', {
+        length: number;
+        minItems: number;
+    }>;
+    type MinLength = JSLError<'min-length-error', {
+        length: number;
+        minLength: number;
+    }>;
+    type MinProperties = JSLError<'min-properties-error', {
+        length: number;
+        minProperties: number;
+    }>;
+    type Minimum = JSLError<'minimum-error', {
+        length: number | string;
+        minimum: number | string;
+    }>;
+    type MultipleOf = JSLError<'multiple-of-error', {
+        multipleOf: number | string;
+    }>;
+    type NodeParameters = JSLError<'node-parameters-error', {
+        validator: Validator<JsonSchema>;
+    }>;
+    type Not = JSLError<'not-error', {
+        not: JsonSchema;
+    }>;
+    type OneOf = JSLError<'one-of-error', {
+        errors: JSLErrors.Error[];
+        oneOf: JsonSchema[];
+    }>;
+    type Pattern = JSLError<'pattern-error', {
+        description: string;
+        pattern: string;
+        received: string;
+    }>;
+    type PropertyNames = JSLError<'invalid-property-name-error', {
+        property: string;
+        validationError: JSLErrors.Error;
+    }>;
+    type Required = JSLError<'required-property-error', {
+        key: string;
+    }>;
+    type Type = JSLError<'type-error', {
+        expected: string;
+        received: string;
+    }>;
+    type UniqueItems = JSLError<'unique-items-error', {
+        arrayPointer: string;
+        duplicatePointer: string;
+    }>;
+    type Error = AdditionalItems | AdditionalProperties | AnyOf | Const | ContainsAny | ContainsMin | Dependencies | Enum | ExclusiveMaximum | ExclusiveMinimum | MaxItems | MaxLength | MaxProperties | Maximum | MinItems | MinLength | MinProperties | Minimum | MultipleOf | NodeParameters | Not | OneOf | Pattern | PropertyNames | Required | Type | UniqueItems;
+    type ErrorCode = Error['code'];
+}
+export {};

package/build/esm/lib/unstable/core/types/schema.d.ts

@@ -1,147 +1,30 @@
-import type { EntityType, JsonSchemaType } from '../constants';
-import type { SchemaRendererConfig } from './config';
-import type { ExtractControlProps, ExtractViewProps, ExtractWrapperProps, ObjectKeys } from './helpers';
-import type { ErrorMessages } from './validation';
+import type { JsonSchemaType, NodeType } from '../constants';
+import type { NodeEntity, NodeLayout } from './components';
+import type { ErrorMessages, Validator } from './validation';
 import type { ArrayValue, FieldValue, ObjectValue } from './values';
-type ControlEntityParameters<TypeConfig extends SchemaRendererConfig[EntityType], Control extends ObjectKeys<TypeConfig['controls']> = ObjectKeys<TypeConfig['controls']>> = [Control] extends [never] ? {} : {
-    [C in Control]: {
-        /**
-         * Identifier of a control registered in `config[entityType].controls`. Selects
-         * which React component renders the field in form mode. When omitted, the
-         * renderer falls back to the default control for this entity type.
-         */
-        controlType?: C;
-        /**
-         * Extra props forwarded to the selected control. Typed to the `controlProps`
-         * shape declared by the chosen control component.
-         */
-        controlProps?: ExtractControlProps<TypeConfig['controls'][C]>;
-    };
-}[Control];
-type ControlWrapperEntityParameters<TypeConfig extends SchemaRendererConfig[EntityType], Wrapper extends ObjectKeys<TypeConfig['wrappers']> = ObjectKeys<TypeConfig['wrappers']>> = [Wrapper] extends [never] ? {} : {
-    [W in Wrapper]: {
-        /**
-         * Identifier of a wrapper registered in `config[entityType].wrappers`. The
-         * wrapper component is rendered around the control in form mode (e.g. to add
-         * a label, layout, or visibility logic).
-         */
-        controlWrapperType?: W;
-        /**
-         * Extra props forwarded to the selected control wrapper. Typed to the
-         * `wrapperProps` shape declared by the chosen wrapper component.
-         */
-        controlWrapperProps?: ExtractWrapperProps<TypeConfig['wrappers'][W]>;
-    };
-}[Wrapper];
-type ViewEntityParameters<TypeConfig extends SchemaRendererConfig[EntityType], View extends ObjectKeys<TypeConfig['views']> = ObjectKeys<TypeConfig['views']>> = [View] extends [never] ? {} : {
-    [V in View]: {
-        /**
-         * Identifier of a view registered in `config[entityType].views`. Selects which
-         * React component renders the field in overview (read-only) mode. When omitted,
-         * the renderer falls back to the default view for this entity type.
-         */
-        viewType?: V;
-        /**
-         * Extra props forwarded to the selected view. Typed to the `viewProps` shape
-         * declared by the chosen view component.
-         */
-        viewProps?: ExtractViewProps<TypeConfig['views'][V]>;
-    };
-}[View];
-type ViewWrapperEntityParameters<TypeConfig extends SchemaRendererConfig[EntityType], Wrapper extends ObjectKeys<TypeConfig['wrappers']> = ObjectKeys<TypeConfig['wrappers']>> = [Wrapper] extends [never] ? {} : {
-    [W in Wrapper]: {
-        /**
-         * Identifier of a wrapper registered in `config[entityType].wrappers`. The
-         * wrapper component is rendered around the view in overview mode.
-         */
-        viewWrapperType?: W;
-        /**
-         * Extra props forwarded to the selected view wrapper. Typed to the
-         * `wrapperProps` shape declared by the chosen wrapper component.
-         */
-        viewWrapperProps?: ExtractWrapperProps<TypeConfig['wrappers'][W]>;
-    };
-}[Wrapper];
-type ValidatorEntityParameters<Validator extends string> = [Validator] extends [never] ? {} : {
-    [V in Validator]: {
-        /**
-         * Identifier of a custom validator registered in `config[entityType].validators`.
-         * Runs in addition to (or instead of, depending on the renderer policy) the
-         * JSON Schema validation derived from the schema keywords.
-         *
-         * TODO(verify): confirm whether the custom validator replaces or complements
-         * JSON Schema validation and adjust this comment.
-         */
-        validatorType?: V;
-    };
-}[Validator];
-/**
- * Renderer-specific configuration carried on each schema node. Not part of the
- * JSON Schema specification — these keywords are ignored by JSON Schema
- * validators and consumed only by SchemaRenderer to choose controls, views,
- * wrappers, validators, and custom error messages for the field.
- *
- * Generic parameters bind the available `controlType` / `viewType` /
- * `wrapperType` / `validatorType` values to those registered in the
- * `SchemaRendererConfig` for this entity type — making invalid identifiers a
- * TypeScript error at the schema declaration site.
- */
-interface EntityParameters<Type extends EntityType, TypeConfig extends SchemaRendererConfig[Type], Control extends ObjectKeys<TypeConfig['controls']> = ObjectKeys<TypeConfig['controls']>, View extends ObjectKeys<TypeConfig['views']> = ObjectKeys<TypeConfig['views']>, Wrapper extends ObjectKeys<TypeConfig['wrappers']> = ObjectKeys<TypeConfig['wrappers']>, Validator extends ObjectKeys<TypeConfig['validators']> = ObjectKeys<TypeConfig['validators']>> {
-    /**
-     * Optional bag of renderer-specific configuration for this schema node.
-     * Ignored by JSON Schema validators.
-     */
-    entityParameters?: {
-        /**
-         * Forces the renderer to treat this node as a specific `EntityType`, overriding
-         * the inference based on the JSON Schema `type` keyword. Useful when a single
-         * JSON type should be rendered as multiple kinds of UI (e.g. `String` rendered
-         * via different `EntityType` registrations).
-         */
-        type?: Type;
-        /**
-         * Custom error messages shown by the renderer when validation fails. Keys
-         * correspond to JSON Schema validation keywords (`minLength`, `pattern`, `enum`,
-         * etc.).
-         *
-         * `dependencies` and `required` accept either a single string (used for any
-         * failure of that keyword) or a `Record<string, string>` mapping the dependent /
-         * required property name to its own message.
-         *
-         * Not part of the JSON Schema specification — purely a UI override for this
-         * renderer.
-         *
-         * @example
-         * {
-         *   type: JsonSchemaType.String,
-         *   minLength: 5,
-         *   entityParameters: {
-         *     errorMessages: {minLength: 'Must be at least 5 characters'},
-         *   },
-         * }
-         *
-         * @example
-         * // Per-property message for required.
-         * {
-         *   type: JsonSchemaType.Object,
-         *   required: ['name', 'email'],
-         *   entityParameters: {
-         *     errorMessages: {
-         *       required: {name: 'Name is required', email: 'Email is required'},
-         *     },
-         *   },
-         * }
-         */
+interface NodeParameters<Type extends NodeType, Schema extends JsonSchema> {
+    nodeParameters?: {
+        entity?: string | NodeEntity<Schema>;
+        entityProps?: Record<string, any>;
         errorMessages?: Omit<ErrorMessages, 'dependencies' | 'required'> & {
-            dependencies?: string | Record<string, string>;
-            required?: string | Record<string, string>;
+            dependencies?: ErrorMessages['dependencies'] | Record<string, ErrorMessages['dependencies']>;
+            required?: ErrorMessages['required'] | Record<string, ErrorMessages['required']>;
         };
-    } & ControlEntityParameters<TypeConfig, Control> & ControlWrapperEntityParameters<TypeConfig, Wrapper> & ViewEntityParameters<TypeConfig, View> & ViewWrapperEntityParameters<TypeConfig, Wrapper> & ValidatorEntityParameters<Validator>;
+        formEntity?: string | NodeEntity<Schema>;
+        formEntityProps?: Record<string, any>;
+        formLayout?: string | NodeLayout<Schema>;
+        formLayoutProps?: Record<string, any>;
+        layout?: string | NodeLayout<Schema>;
+        layoutProps?: Record<string, any>;
+        overviewEntity?: string | NodeEntity<Schema>;
+        overviewEntityProps?: Record<string, any>;
+        overviewLayout?: string | NodeLayout<Schema>;
+        overviewLayoutProps?: Record<string, any>;
+        type?: Type;
+        validator?: string | Validator<Schema>;
+    };
 }
-/**
- * Common JSON Schema keywords inherited by every concrete schema variant.
- */
-interface JsonSchemaBase<Config extends SchemaRendererConfig, Schema extends JsonSchema<Config>, Value extends FieldValue> {
+interface JsonSchemaBase<Type extends NodeType, Schema extends JsonSchema, Value extends FieldValue> extends NodeParameters<Type, Schema> {
     /**
      * Unique URI identifier for the schema; establishes the base URI used to resolve
      * relative `$ref`s in all nested sub-schemas.
@@ -265,7 +148,7 @@ interface JsonSchemaBase<Config extends SchemaRendererConfig, Schema extends Jso
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.9
      */
     definitions?: {
-        [key: string]: JsonSchema<Config>;
+        [key: string]: JsonSchema;
     };
     /**
      * Longer human-readable explanation of the schema. The SchemaRenderer renders it
@@ -421,7 +304,7 @@ interface JsonSchemaBase<Config extends SchemaRendererConfig, Schema extends Jso
 /**
  * Schema variant without an explicit `type` keyword. Matches values of any JSON type and accepts every keyword from the typed variants.
  */
-export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extends JsonSchemaBase<Config, JsonSchema<Config>, FieldValue>, EntityParameters<EntityType.Any, Config[EntityType.Any]> {
+export interface JsonSchemaAny extends JsonSchemaBase<NodeType.Any, JsonSchema, FieldValue> {
     /**
      * Optional declared JSON type(s). When omitted, the schema matches any JSON type
      * and every keyword from the typed variants is accepted (each behaving according
@@ -460,7 +343,7 @@ export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extend
      *
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.4.2
      */
-    additionalItems?: JsonSchema<Config> | boolean;
+    additionalItems?: JsonSchema | boolean;
     /**
      * Schema applied to object properties not listed in `properties` and not matched
      * by any `patternProperties` key; ignored for non-object values.
@@ -480,7 +363,7 @@ export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extend
      *
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.6
      */
-    additionalProperties?: JsonSchema<Config> | boolean;
+    additionalProperties?: JsonSchema | boolean;
     /**
      * Sub-schema that **at least one** array item must satisfy; ignored for non-array
      * values. An empty array always fails `contains`.
@@ -494,7 +377,7 @@ export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extend
      *
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.4.6
      */
-    contains?: JsonSchema<Config> | boolean;
+    contains?: JsonSchema | boolean;
     /**
      * Property dependencies on an object value; ignored for non-object values.
      * Each key triggers a constraint only when that property is present in the value.
@@ -517,7 +400,7 @@ export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extend
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.7
      */
     dependencies?: {
-        [key: string]: string[] | JsonSchema<Config>;
+        [key: string]: string[] | JsonSchema;
     };
     /**
      * Strict upper bound for numeric values (value must be strictly less than this);
@@ -564,7 +447,7 @@ export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extend
      *
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.4.1
      */
-    items?: JsonSchema<Config> | JsonSchema<Config>[];
+    items?: JsonSchema | JsonSchema[];
     /**
      * Inclusive upper bound for numeric values; ignored for non-numeric values.
      *
@@ -698,7 +581,7 @@ export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extend
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.5
      */
     patternProperties?: {
-        [key: string]: JsonSchema<Config>;
+        [key: string]: JsonSchema;
     };
     /**
      * Map of property name to schema. Each listed property's value must validate
@@ -714,7 +597,7 @@ export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extend
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.4
      */
     properties?: {
-        [key: string]: JsonSchema<Config>;
+        [key: string]: JsonSchema;
     };
     /**
      * Schema each property **name** must satisfy; ignored for non-object values.
@@ -727,7 +610,7 @@ export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extend
      *
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.8
      */
-    propertyNames?: JsonSchemaString<Config>;
+    propertyNames?: JsonSchemaString;
     /**
      * Names of properties that must be present on the object value; ignored for
      * non-object values.
@@ -744,6 +627,14 @@ export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extend
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.3
      */
     required?: string[];
+    stringNumber?: {
+        type?: JsonSchemaType.Number | JsonSchemaType.Integer | JsonSchemaType.Null | (JsonSchemaType.Number | JsonSchemaType.Integer | JsonSchemaType.Null)[];
+        exclusiveMaximum?: string;
+        exclusiveMinimum?: string;
+        maximum?: string;
+        minimum?: string;
+        multipleOf?: string;
+    };
     /**
      * When `true`, every array item must be unique; ignored for non-array values.
      *
@@ -760,7 +651,7 @@ export interface JsonSchemaAny<Config extends SchemaRendererConfig = any> extend
 /**
  * Schema for array values (`type: JsonSchemaType.Array`).
  */
-export interface JsonSchemaArray<Config extends SchemaRendererConfig = any> extends JsonSchemaBase<Config, JsonSchemaArray<Config>, ArrayValue>, EntityParameters<EntityType.Array, Config[EntityType.Array]> {
+export interface JsonSchemaArray extends JsonSchemaBase<NodeType.Array, JsonSchemaArray, ArrayValue> {
     /**
      * Declares this schema as describing an array value (or `null`, or a union of
      * the two for nullable arrays).
@@ -792,7 +683,7 @@ export interface JsonSchemaArray<Config extends SchemaRendererConfig = any> exte
      *
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.4.2
      */
-    additionalItems?: JsonSchema<Config> | boolean;
+    additionalItems?: JsonSchema | boolean;
     /**
      * Sub-schema that **at least one** array item must satisfy. An empty array
      * always fails `contains`.
@@ -806,7 +697,7 @@ export interface JsonSchemaArray<Config extends SchemaRendererConfig = any> exte
      *
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.4.6
      */
-    contains?: JsonSchema<Config> | boolean;
+    contains?: JsonSchema | boolean;
     /**
      * Constrains array items. Two forms:
      *
@@ -824,7 +715,7 @@ export interface JsonSchemaArray<Config extends SchemaRendererConfig = any> exte
      *
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.4.1
      */
-    items?: JsonSchema<Config> | JsonSchema<Config>[];
+    items?: JsonSchema | JsonSchema[];
     /**
      * Maximum number of items the array may contain.
      *
@@ -859,7 +750,7 @@ export interface JsonSchemaArray<Config extends SchemaRendererConfig = any> exte
 /**
  * Schema for boolean values (`type: JsonSchemaType.Boolean`).
  */
-export interface JsonSchemaBoolean<Config extends SchemaRendererConfig = any> extends JsonSchemaBase<Config, JsonSchemaBoolean<Config>, boolean>, EntityParameters<EntityType.Boolean, Config[EntityType.Boolean]> {
+export interface JsonSchemaBoolean extends JsonSchemaBase<NodeType.Boolean, JsonSchemaBoolean, boolean> {
     /**
      * Declares this schema as describing a boolean value (or `null`, or a union of
      * the two for nullable booleans).
@@ -878,7 +769,7 @@ export interface JsonSchemaBoolean<Config extends SchemaRendererConfig = any> ex
 /**
  * Schema for numeric values (`type: JsonSchemaType.Number`).
  */
-export interface JsonSchemaNumber<Config extends SchemaRendererConfig = any> extends JsonSchemaBase<Config, JsonSchemaNumber<Config>, number>, EntityParameters<EntityType.Number, Config[EntityType.Number]> {
+export interface JsonSchemaNumber extends JsonSchemaBase<NodeType.Number, JsonSchemaNumber, number> {
     /**
      * Declares this schema as describing a numeric value.
      *
@@ -960,7 +851,7 @@ export interface JsonSchemaNumber<Config extends SchemaRendererConfig = any> ext
 /**
  * Schema for object values (`type: JsonSchemaType.Object`).
  */
-export interface JsonSchemaObject<Config extends SchemaRendererConfig = any> extends JsonSchemaBase<Config, JsonSchemaObject<Config>, ObjectValue>, EntityParameters<EntityType.Object, Config[EntityType.Object]> {
+export interface JsonSchemaObject extends JsonSchemaBase<NodeType.Object, JsonSchemaObject, ObjectValue> {
     /**
      * Declares this schema as describing an object value (or `null`, or a union of
      * the two for nullable objects).
@@ -1000,7 +891,7 @@ export interface JsonSchemaObject<Config extends SchemaRendererConfig = any> ext
      *
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.6
      */
-    additionalProperties?: JsonSchema<Config> | boolean;
+    additionalProperties?: JsonSchema | boolean;
     /**
      * Property dependencies. Each key triggers a constraint only when that property
      * is present in the value.
@@ -1022,7 +913,7 @@ export interface JsonSchemaObject<Config extends SchemaRendererConfig = any> ext
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.7
      */
     dependencies?: {
-        [key: string]: string[] | JsonSchemaObject<Config>;
+        [key: string]: string[] | JsonSchemaObject;
     };
     /**
      * Maximum number of own properties the object may declare.
@@ -1059,7 +950,7 @@ export interface JsonSchemaObject<Config extends SchemaRendererConfig = any> ext
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.5
      */
     patternProperties?: {
-        [key: string]: JsonSchema<Config>;
+        [key: string]: JsonSchema;
     };
     /**
      * Map of property name to schema. Each listed property's value must validate
@@ -1080,7 +971,7 @@ export interface JsonSchemaObject<Config extends SchemaRendererConfig = any> ext
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.4
      */
     properties?: {
-        [key: string]: JsonSchema<Config>;
+        [key: string]: JsonSchema;
     };
     /**
      * Schema each property **name** must satisfy. Object keys are always strings, so
@@ -1093,7 +984,7 @@ export interface JsonSchemaObject<Config extends SchemaRendererConfig = any> ext
      *
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5.8
      */
-    propertyNames?: JsonSchema<Config>;
+    propertyNames?: JsonSchema;
     /**
      * Names of properties that must be present on the object value.
      *
@@ -1113,7 +1004,7 @@ export interface JsonSchemaObject<Config extends SchemaRendererConfig = any> ext
 /**
  * Schema for string values (`type: JsonSchemaType.String`).
  */
-export interface JsonSchemaString<Config extends SchemaRendererConfig = any> extends JsonSchemaBase<Config, JsonSchemaString<Config>, string>, EntityParameters<EntityType.String, Config[EntityType.String]> {
+export interface JsonSchemaString extends JsonSchemaBase<NodeType.String, JsonSchemaString, string> {
     /**
      * Declares this schema as describing a string value (or `null`, or a union of
      * the two for nullable strings).
@@ -1172,6 +1063,14 @@ export interface JsonSchemaString<Config extends SchemaRendererConfig = any> ext
      * @see https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.3.3
      */
     pattern?: string;
+    stringNumber?: {
+        type?: JsonSchemaType.Number | JsonSchemaType.Integer | JsonSchemaType.Null | (JsonSchemaType.Number | JsonSchemaType.Integer | JsonSchemaType.Null)[];
+        exclusiveMaximum?: string;
+        exclusiveMinimum?: string;
+        maximum?: string;
+        minimum?: string;
+        multipleOf?: string;
+    };
 }
 /**
  * Discriminated union of every supported JSON Schema variant. Narrow with the `type` keyword to access type-specific fields.
@@ -1182,5 +1081,5 @@ export interface JsonSchemaString<Config extends SchemaRendererConfig = any> ext
  * @example
  * const schema: JsonSchema = { type: JsonSchemaType.Object, properties: { id: { type: JsonSchemaType.Number } } };
  */
-export type JsonSchema<Config extends SchemaRendererConfig = any> = JsonSchemaAny<Config> | JsonSchemaArray<Config> | JsonSchemaBoolean<Config> | JsonSchemaNumber<Config> | JsonSchemaObject<Config> | JsonSchemaString<Config>;
+export type JsonSchema = JsonSchemaAny | JsonSchemaArray | JsonSchemaBoolean | JsonSchemaNumber | JsonSchemaObject | JsonSchemaString;
 export {};